improve toggle naming