Fix the class and change names