Changing file names to match the spec.