Made better class names

They're better now