Add in type names