Standardise use of strings and generics for type tokens.