[issue-309] Use underscores instead of dashes