Fix an error in 4d1d7ac - get short name from classname
Merge pull request #748 from adamwight/fix_entity_name

Fix an error in 4d1d7ac - get short name from classname