Rename classes to match CamelCase