Rename classes to be accepted by Puppet