Use underscores instead of dashes

Dahses are confusing and annoying! :(