refactored class names to CamelCase, oops...