fix some oversights with class names