diff --git a/userspace/SWUTS.h b/userspace/SWUTS.h
index 14a9b222b..ef4d697d2 100644
--- a/userspace/SWUTS.h
+++ b/userspace/SWUTS.h
@@ -38,6 +38,9 @@
  *   - @ref SWUTS-netlist
  *   - @ref SWUTS-fifo
  *   - @ref SWUTS-fifo-channel
+ *   - @ref SWUTS-fifo-channel-gk20a
+ *   - @ref SWUTS-fifo-channel-gm20b
+ *   - @ref SWUTS-fifo-channel-gv11b
  *   - @ref SWUTS-fifo-pbdma
  *   - @ref SWUTS-fifo-runlist
  *   - @ref SWUTS-fifo-runlist-gk20a
diff --git a/userspace/SWUTS.sources b/userspace/SWUTS.sources
index a648fd9be..728a514c2 100644
--- a/userspace/SWUTS.sources
+++ b/userspace/SWUTS.sources
@@ -8,13 +8,13 @@ INPUT += ../../../userspace/units/falcon/falcon_tests/nvgpu-falcon.h
 INPUT += ../../../userspace/units/netlist/nvgpu-netlist.h
 INPUT += ../../../userspace/units/fifo/nvgpu-fifo.h
 INPUT += ../../../userspace/units/fifo/channel/nvgpu-channel.h
-INPUT += ../../../userspace/units/fifo/channel/nvgpu-channel-gk20a.h
-INPUT += ../../../userspace/units/fifo/channel/nvgpu-channel-gm20b.h
-INPUT += ../../../userspace/units/fifo/channel/nvgpu-channel-gv11b.h
+INPUT += ../../../userspace/units/fifo/channel/gk20a/nvgpu-channel-gk20a.h
+INPUT += ../../../userspace/units/fifo/channel/gm20b/nvgpu-channel-gm20b.h
+INPUT += ../../../userspace/units/fifo/channel/gv11b/nvgpu-channel-gv11b.h
 INPUT += ../../../userspace/units/fifo/pbdma/nvgpu-pbdma.h
 INPUT += ../../../userspace/units/fifo/runlist/nvgpu-runlist.h
-INPUT += ../../../userspace/units/fifo/runlist/nvgpu-runlist-gk20a.h
-INPUT += ../../../userspace/units/fifo/runlist/nvgpu-runlist-gv11b.h
+INPUT += ../../../userspace/units/fifo/runlist/gk20a/nvgpu-runlist-gk20a.h
+INPUT += ../../../userspace/units/fifo/runlist/gv11b/nvgpu-runlist-gv11b.h
 INPUT += ../../../userspace/units/fifo/tsg/nvgpu-tsg.h
 INPUT += ../../../userspace/units/fifo/tsg/gv11b/nvgpu-tsg-gv11b.h
 INPUT += ../../../userspace/units/fuse/nvgpu-fuse.h