Use idiomatic dashes rather than underscores in fields for issue #20.