refactore of class names