Fix naming from old version