Add suffix _t to several classes #1430

Job	Run time
ubuntu-test-install (public)	3m 0s
ubuntu-test-install (middle_schema)	3m 59s
	6m 59s

Provide feedback