Fix a few controller references from rename