Fix the naming of these classes