#86 Updated class names to adhere to new styleguide