Update the class names to the naming convention