More unified naming for the experiments on the various files.