Renamed all the Types to Types