Finish up some renaming from earlier (controller tests should pass now)