Refactored the name of the classes