Fixed refactoring rename