rename some classes to more convenient names