Revised and simpler rename refactoring...