Change how controls are identified so that they only need to have unique names per section