Renamed, undid re-exports in types, and updated references in types.