Renamed the wrapper class.
General purpose cleanup.