Rename refactoring and minor changes