s/_BDDVARIABLES/_VARS
Get rid of some class hierarchy