Standardized controller names; updated controller unit tests to match new names