Finish oauth renaming support