update variable names to match the derivation ones

• variable names are update to match those stored in the derivation. This should be the final change before announcing new recommendations.

cc: @bnachman @woodsn