Modifying the class and method naming