Modify class name to a more logical one