Update to use new convention for snippet variables
Merge pull request #852 from markewallace/UpdateVariableNames

Update to use new convention for snippet variables