A bit OCD, but I noticed that the checkout forms were an exception in using a hyphen so I've cleaned up all IDs to use underscores.