Catched up to the new class name