rename some classes for consistency.