diff --git a/qcodes/loops.py b/qcodes/loops.py
index 0b5c554c63c5..b623d71d1fe5 100644
--- a/qcodes/loops.py
+++ b/qcodes/loops.py
@@ -642,7 +642,7 @@ def _make_setpoint_array(self, shape, i, prev_setpoints, vals, name,
             name = 'index{}'.format(i)
 
         return DataArray(name=name, label=label, set_arrays=prev_setpoints,
-                         shape=shape, preset_data=vals)
+                         shape=shape, preset_data=vals, is_setpoint=True)
 
     def _default_setpoints(self, shape):
         if len(shape) == 1:
diff --git a/qcodes/tests/test_loop.py b/qcodes/tests/test_loop.py
index b05276ba4ef1..fff3414ba826 100644
--- a/qcodes/tests/test_loop.py
+++ b/qcodes/tests/test_loop.py
@@ -215,7 +215,7 @@ def test_sync_no_overwrite(self):
                                                                                  self.gates.chan2[0:1:1], 0.000001))
         data = loop.get_data_set(name='testsweep', write_period=0.01)
         _ = loop.with_bg_task(data.sync).run()
-        assert not np.isnan(data.chan2).any()
+        assert not np.isnan(data.chan2_set).any()
 
 def sleeper(t):
     time.sleep(t)
@@ -467,7 +467,7 @@ def test_composite_params(self):
         self.assertEqual(data.p1_set.tolist(), [1, 2])
         self.assertEqual(data.one.tolist(), [1, 1])
         self.assertEqual(data.onetwo.tolist(), [[1, 2]] * 2)
-        self.assertEqual(data.index0.tolist(), [[0, 1]] * 2)
+        self.assertEqual(data.index0_set.tolist(), [[0, 1]] * 2)
 
         # give it setpoints, names, and labels
         mg.setpoints = (None, ((10, 11),))
@@ -478,8 +478,8 @@ def test_composite_params(self):
 
         data = loop.run_temp()
 
-        self.assertEqual(data.highest.tolist(), [[10, 11]] * 2)
-        self.assertEqual(data.highest.label, sp_label)
+        self.assertEqual(data.highest_set.tolist(), [[10, 11]] * 2)
+        self.assertEqual(data.highest_set.label, sp_label)
 
         # setpoints as DataArray - name and label here override
         # setpoint_names and setpoint_labels attributes
@@ -490,8 +490,8 @@ def test_composite_params(self):
         mg.setpoints = (None, (sp_dataarray,))
 
         data = loop.run_temp()
-        self.assertEqual(data.bgn.tolist(), [[6, 7]] * 2)
-        self.assertEqual(data.bgn.label, new_sp_label)
+        self.assertEqual(data.bgn_set.tolist(), [[6, 7]] * 2)
+        self.assertEqual(data.bgn_set.label, new_sp_label)
 
         # muck things up and test for errors
         mg.setpoints = (None, ((1, 2, 3),))
@@ -522,7 +522,7 @@ def test_composite_params(self):
 
         self.assertEqual(data.p1_set.tolist(), [1, 2])
         self.assertEqual(data.arr.tolist(), [[4, 5, 6]] * 2)
-        self.assertEqual(data.index0.tolist(), [[0, 1, 2]] * 2)
+        self.assertEqual(data.index0_set.tolist(), [[0, 1, 2]] * 2)
 
         mg = MultiGetter(arr2d=((21, 22), (23, 24)))
         loop = Loop(self.p1[1:3:1], 0.001).each(mg)
@@ -530,8 +530,8 @@ def test_composite_params(self):
 
         self.assertEqual(data.p1_set.tolist(), [1, 2])
         self.assertEqual(data.arr2d.tolist(), [[[21, 22], [23, 24]]] * 2)
-        self.assertEqual(data.index0.tolist(), [[0, 1]] * 2)
-        self.assertEqual(data.index1.tolist(), [[[0, 1]] * 2] * 2)
+        self.assertEqual(data.index0_set.tolist(), [[0, 1]] * 2)
+        self.assertEqual(data.index1_set.tolist(), [[[0, 1]] * 2] * 2)
 
     def test_bad_actors(self):
         def f():
diff --git a/qcodes/tests/test_measure.py b/qcodes/tests/test_measure.py
index e72f3880167e..90deae7dd923 100644
--- a/qcodes/tests/test_measure.py
+++ b/qcodes/tests/test_measure.py
@@ -34,7 +34,7 @@ def test_simple_scalar(self):
     def test_simple_array(self):
         data = Measure(MultiGetter(arr=(1.2, 3.4))).run_temp()
 
-        self.assertEqual(data.index0.tolist(), [0, 1])
+        self.assertEqual(data.index0_set.tolist(), [0, 1])
         self.assertEqual(data.arr.tolist(), [1.2, 3.4])
         self.assertEqual(len(data.arrays), 2, data.arrays)
 
@@ -44,6 +44,6 @@ def test_array_and_scalar(self):
 
         self.assertEqual(data.single_set.tolist(), [0])
         self.assertEqual(data.P1.tolist(), [42])
-        self.assertEqual(data.index0.tolist(), [0, 1])
+        self.assertEqual(data.index0_set.tolist(), [0, 1])
         self.assertEqual(data.arr.tolist(), [5, 6])
         self.assertEqual(len(data.arrays), 4, data.arrays)