CSPACE-6269: Update relevant class, module names, etc. to use underscores rather than hyphens, per Puppet naming requirements.