Bit of uniformity

Changed some class names to make more sense