rename some classes for consistency.
Merging.