Replace old with new class and alias