Underscore separators -> dash, closes item:366