Switched to a different naming convention so class names are capitalized