Rename and merge controllers