Fix a incorrect namespace/class/file names following rename