revising class names
machine-generated version