Pedagogy and class-name fixes