CFY-1372 puppet types according to tosca naming conventions