More cleaning up of scenario verbiage.