Some renaming after revert