Continued refactoring agent and updating names.