Entity.displayName not to include Impl suffix
Cleanup usage of entity.getDisplayName()
Merge pull request #599 from aledsage/fix/Entity-displayName

Fix/entity display name