diff --git a/artiq/devices/dds_core.py b/artiq/devices/dds_core.py
index f5bb2c293..d681ac339 100644
--- a/artiq/devices/dds_core.py
+++ b/artiq/devices/dds_core.py
@@ -13,15 +13,15 @@ class DDS(AutoContext):
     :param dds_sysclk: DDS system frequency, used for computing the frequency
         tuning words.
     :param reg_channel: channel number of the DDS device to control.
-    :param rtio_channel: RTIO channel number of the RF switch associated with
+    :param rtio_switch: RTIO channel number of the RF switch associated with
         the DDS device.
 
     """
-    parameters = "dds_sysclk reg_channel rtio_channel"
+    parameters = "dds_sysclk reg_channel rtio_switch"
 
     def build(self):
         self.previous_frequency = 0*MHz
-        self.sw = rtio_core.RTIOOut(self, channel=self.rtio_channel)
+        self.sw = rtio_core.RTIOOut(self, channel=self.rtio_switch)
 
     kernel_attr = "previous_frequency"
 
diff --git a/examples/compiler_test.py b/examples/compiler_test.py
index b16be5fe1..cbc28a116 100644
--- a/examples/compiler_test.py
+++ b/examples/compiler_test.py
@@ -36,13 +36,13 @@ def main():
     exp = CompilerTest(
         core=coredev,
         a=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                       reg_channel=0, rtio_channel=0),
+                       reg_channel=0, rtio_switch=0),
         b=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                       reg_channel=1, rtio_channel=1),
+                       reg_channel=1, rtio_switch=1),
         A=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                       reg_channel=2, rtio_channel=2),
+                       reg_channel=2, rtio_switch=2),
         B=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                       reg_channel=3, rtio_channel=3)
+                       reg_channel=3, rtio_switch=3)
     )
     exp.run(3, 100*us)
 
diff --git a/examples/dds_test.py b/examples/dds_test.py
index 0137ff092..7d8bc666f 100644
--- a/examples/dds_test.py
+++ b/examples/dds_test.py
@@ -28,14 +28,14 @@ def main():
         exp = DDSTest(
             core=coredev,
             a=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                           reg_channel=0, rtio_channel=0),
+                           reg_channel=0, rtio_switch=0),
             b=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                           reg_channel=1, rtio_channel=1),
+                           reg_channel=1, rtio_switch=1),
             c=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                           reg_channel=2, rtio_channel=2),
+                           reg_channel=2, rtio_switch=2),
             d=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                           reg_channel=3, rtio_channel=3),
-            led=gpio_core.GPIOOut(core=coredev, channel=1)
+                           reg_channel=3, rtio_switch=3),
+            led=gpio_core.GPIOOut(core=coredev, channel=0)
         )
         exp.run()
 
diff --git a/examples/photon_histogram.py b/examples/photon_histogram.py
index 27856dae4..394d8b76f 100644
--- a/examples/photon_histogram.py
+++ b/examples/photon_histogram.py
@@ -41,9 +41,9 @@ def main():
         exp = PhotonHistogram(
             core=coredev,
             bd=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                            reg_channel=0, rtio_channel=1),
+                            reg_channel=0, rtio_switch=1),
             bdd=dds_core.DDS(core=coredev, dds_sysclk=1*GHz,
-                             reg_channel=1, rtio_channel=2),
+                             reg_channel=1, rtio_switch=2),
             pmt=rtio_core.RTIOIn(core=coredev, channel=0),
             repeats=100,
             nbins=100