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

Revert "Change references to class names containing dashes"