Revert "Revert "Change references to class names containing dashes""
Merge pull request #67 from cargomedia/revert-66-revert-64-issue-64

Revert "Revert "Change references to class names containing dashes""