Remove underscore in favor of hyphen in naming
Merge remote-tracking branch 'origin/adamed/refactor'