Use new class name