Renamed Dataspace to DataSpace for consistency