Classes were renaimed to more appropriate