renaming some methods and class