[#65294674] Use underscores for class names

To match gds/puppet@88993ca