[HiP-40]: controller names are changed