Small cleanup accedently inverted names of classes between two fixes.