renamed some functions and class members