renamed some classes and variables