Use the same type-names as everywhere else