Made the format of the scenario definitions consistent with one another