Replaced dashes with underscores.
Validation plugins adapted to the dash/underscore replacement.