Merge pull request #2340 from joto/refactor-class-names #1338

Job	Run time
ubuntu-test-install (public)	4m 3s
ubuntu-test-install (middle_schema)	4m 15s
	8m 18s

Provide feedback