Refactored IsRenamingAllowed
Fixed Bug with "this" renaming