Changing class names to make code more clear