Rename some classes for clarity