Renamed types, because modules already disambiguate