diff --git a/userspace/SWUTS.sources b/userspace/SWUTS.sources
index d49c5ebdb..500527e83 100644
--- a/userspace/SWUTS.sources
+++ b/userspace/SWUTS.sources
@@ -91,11 +91,11 @@ INPUT += ../../../userspace/units/class/nvgpu-class.h
 INPUT += ../../../userspace/units/gr/nvgpu-gr.h
 INPUT += ../../../userspace/units/gr/setup/nvgpu-gr-setup.h
 INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-intr.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-init-hal-gv11b.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-falcon.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-fs-state.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-global-ctx.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-ctx.h
-INPUT += ../../../userspace/units/gr/intr/nvgpu-gr-obj-ctx.h
+INPUT += ../../../userspace/units/gr/init/nvgpu-gr-init-hal-gv11b.h
+INPUT += ../../../userspace/units/gr/falcon/nvgpu-gr-falcon.h
+INPUT += ../../../userspace/units/gr/fs_state/nvgpu-gr-fs-state.h
+INPUT += ../../../userspace/units/gr/global_ctx/nvgpu-gr-global-ctx.h
+INPUT += ../../../userspace/units/gr/ctx/nvgpu-gr-ctx.h
+INPUT += ../../../userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.h
 INPUT += ../../../userspace/units/gr/config/nvgpu-gr-config.h
 INPUT += ../../../userspace/units/ecc/nvgpu-ecc.h