Minor name changes in Controller