Vsm charm variable name changes - CSCun47511