Fix a bug; unclear rename refactoring