more control names changed