Fix a bug with refactoring class name