Renamed some classes to get rid of transient namings.
In other words, things that were named in a manner to dilineate themselves from an existing class.
These classes are now gone, so the special names are no longer needed.