Update to use new convention for snippet variables