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

Reverts cargomedia/puppet-cm#66