diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu
index cc1632a02..3d0c19c3e 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -191,7 +191,7 @@ nvgpu-y += \
 	gp106/hal_gp106.o \
 	gp106/mm_gp106.o \
 	gp106/pmu_gp106.o \
-	gp106/pmu_mclk_gp106.o \
+	gp106/mclk_gp106.o \
 	gp106/gr_gp106.o \
 	gp106/gr_ctx_gp106.o \
 	gp106/acr_gp106.o \
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 939854e72..877513511 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -28,8 +28,8 @@
 #include "clk/clk_mclk.h"
 #include "module.h"
 #include "intr.h"
-#include "gp106/pmu_mclk_gp106.h"
 #include "sysfs.h"
+
 #include "pci.h"
 
 #include "os_linux.h"
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index 499fb53ff..5304e079e 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -23,7 +23,7 @@
 #include "gk20a/platform_gk20a.h"
 #include "gm20b/fifo_gm20b.h"
 #include "bios_gm206.h"
-#include "gp106/pmu_mclk_gp106.h"
+#include "gp106/mclk_gp106.h"
 
 #include <nvgpu/hw/gm206/hw_pwr_gm206.h>
 #include <nvgpu/hw/gm206/hw_mc_gm206.h>
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 08639e0b3..f8353296f 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -30,7 +30,7 @@
 #include "clk_gp106.h"
 #include "clk/clk_arb.h"
 
-#include "gp106/pmu_mclk_gp106.h"
+#include "gp106/mclk_gp106.h"
 
 #include <nvgpu/hw/gp106/hw_trim_gp106.h>
 
diff --git a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
similarity index 99%
rename from drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c
rename to drivers/gpu/nvgpu/gp106/mclk_gp106.c
index c0e4269f4..3558b5017 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -20,7 +20,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include "gk20a/platform_gk20a.h"
 #endif
-#include "gp106/pmu_mclk_gp106.h"
+#include "gp106/mclk_gp106.h"
 
 #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.h b/drivers/gpu/nvgpu/gp106/mclk_gp106.h
similarity index 92%
rename from drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.h
rename to drivers/gpu/nvgpu/gp106/mclk_gp106.h
index c61a7572e..dad926fff 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_mclk_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.h
@@ -11,8 +11,8 @@
 * more details.
 */
 
-#ifndef _PMU_MCLK_GP106_H_
-#define _PMU_MCLK_GP106_H_
+#ifndef _MCLK_GP106_H_
+#define _MCLK_GP106_H_
 
 extern int gp106_mclk_init(struct gk20a *g);
 extern void gp106_mclk_deinit(struct gk20a *g);