Update demo files for uniformity

Make changes so different demo files use the same parameter values and
variable names.