Refactorization rename