Rename controls to avoid hungarian notation