Minor Rename refactoring improvements