control name adjust cleanup