Change class names and configs

tests still passing