Removed NameType coupling from Name