Changed controls to use naming conventions