controller name fixes