Modify control id definition to avoid duplication even if the control ids belong to the same control class. Also, not refer to control class in driver.