refactored some names to reflect refactoring of controllers