Use variable names in rules for both blocks-world and puddle-world;