Follow 2.2 and change 8hour->eighthour and 4year->fouryear to avoid having a numeral start an ID. Add some code so it will fix up existing values as they are changed.