remove generic from UniquelyNamedEntity