Fix controller naming inconsistency