control names changed for style consistency