Update variable names in demo scripts