Tweak identifier names
Merge branch 'master' of github.com:alisnic/minscript