Updated (again) class name