demos: removed old variable names.