Just giving demo programs more sensible names.
Minor tweaks to keep the demo code working.