Fixed Yaml loader/dumper to use underscores