[Cyntain] Renamed items to match new names