Fixing some issues with identifiers breaking ShowRenamer plugin