renamed some variables and some classes