Fix after Cartridge name change