Some rename refactor