changed similar class names to be different and more descriptive