Renamed classes, Camel case wins the day
Some config tweaks, added some more units. Done with the yanks!