Entity renaming matches to broadly

[hammar]

Renaming an existing entity to a shorter version of the same name (e.g., NameStub -> Name) fails because Name is detected as already in use.