Modify Cntrl names