renamed some methods and classes