rename some classes to make more sense