renamed methods and class names