Conform spelling to the new regime.