Fixing bad class name camelcasing