Better class names to save on confusion, as I am confused