Gave controls consistent names + events