changed class names to provide clarity