[kiwi & David] rename refactoring