renamed classes to better suit their functions