Fix controller name problems