Renamed some classes and dict keys.