Implement shortcuts on entity names.
Merge pull request #1529 from drak/shortcuts

Implement shortcuts on entity names.