Update to new class name