Commit 52

Fix rename entity by hacking to shortcut binding