Tried to enchance the toggle name regex to be a little more fogiving around dashes and underscores