diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 41dc0028f..32fa4e932 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -185,7 +185,7 @@ nvgpu-y += \
 	os/linux/vm.o \
 	os/linux/intr.o \
 	os/linux/sysfs.o \
-	os/linux/io.o \
+	os/linux/linux-io.o \
 	os/linux/io_usermode.o \
 	os/linux/rwsem.o \
 	os/linux/comptags.o \
@@ -332,7 +332,7 @@ nvgpu-y += \
 	common/init/hal_init.o \
 	common/sec2/sec2.o \
 	common/sec2/sec2_ipc.o \
-	common/io_common.o \
+	common/io/io.o \
 	common/clock_gating/gm20b_gating_reglist.o \
 	common/clock_gating/gp106_gating_reglist.o \
 	common/clock_gating/gp10b_gating_reglist.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 9b1b22c35..b2a4f1dc3 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -27,7 +27,7 @@ srcs +=	os/posix/nvgpu.c \
 	os/posix/bitmap.c \
 	os/posix/log.c \
 	os/posix/kmem.c \
-	os/posix/io.c \
+	os/posix/posix-io.c \
 	os/posix/posix-nvgpu_mem.c \
 	os/posix/posix-dma.c \
 	os/posix/posix-vm.c \
@@ -114,7 +114,7 @@ srcs += common/sim.c \
 	common/ltc/ltc_gm20b.c \
 	common/ltc/ltc_gp10b.c \
 	common/ltc/ltc_gv11b.c  \
-	common/io_common.c \
+	common/io/io.c \
 	common/ecc.c \
 	common/ce2.c \
 	common/vbios/bios.c \
diff --git a/drivers/gpu/nvgpu/common/io_common.c b/drivers/gpu/nvgpu/common/io/io.c
similarity index 100%
rename from drivers/gpu/nvgpu/common/io_common.c
rename to drivers/gpu/nvgpu/common/io/io.c
diff --git a/drivers/gpu/nvgpu/os/linux/io.c b/drivers/gpu/nvgpu/os/linux/linux-io.c
similarity index 100%
rename from drivers/gpu/nvgpu/os/linux/io.c
rename to drivers/gpu/nvgpu/os/linux/linux-io.c
diff --git a/drivers/gpu/nvgpu/os/posix/io.c b/drivers/gpu/nvgpu/os/posix/posix-io.c
similarity index 100%
rename from drivers/gpu/nvgpu/os/posix/io.c
rename to drivers/gpu/nvgpu/os/posix/posix-io.c