Change classes and filenames to consistent UpperCamelCase part 2