changed controller names for consistency