Fix Renamings Dialog
Fixed the out of range exception problem & refactored
Merge branch 'feature/rename_refactoring' into develop