Change _ to - in config YAML

A few early options used underscores instead of the otherwise
preferred hyphens.

Change-Id: I3ad4ba30e16950299de2fa92bdb4ca49ecb2c13f