Continued refactoring and renaming of conversation context and controller.