* Cleanup legacy variable naming style.
* Prepare for authorize scope page.