Bug fixing: Change class name