I'd like to propose that if we're committing to an equivalence formula for our classes we rename the classes, and just list the engines and weights they way they are usually listed for tag rules. If we're trying to pull people in who currently own Yamaha or Animal engines then calling the classes World Formula Light/Masters makes it sound like we don't care if those packages are competitive.