Even more class name cleanup