Refactoring updates in renaming building