Fix broken code; switch order back
New class names