Renamed SubstVars to SubstVar