diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index ef8237f3f..8a95065f4 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -48,7 +48,7 @@ nvgpu-y := \
 	common/linux/sched.o \
 	common/linux/channel.o \
 	common/linux/ce2.o \
-	common/linux/sim_gk20a.o \
+	common/linux/sim.o \
 	common/mm/nvgpu_allocator.o \
 	common/mm/bitmap_allocator.o \
 	common/mm/buddy_allocator.o \
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 950b15811..4fe385887 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -47,7 +47,7 @@
 #include "intr.h"
 #include "cde.h"
 #include "ioctl.h"
-#include "sim_gk20a.h"
+#include "sim.h"
 #ifdef CONFIG_TEGRA_19x_GPU
 #include "nvgpu_gpuid_t19x.h"
 #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
diff --git a/drivers/gpu/nvgpu/common/linux/sim_gk20a.c b/drivers/gpu/nvgpu/common/linux/sim.c
similarity index 99%
rename from drivers/gpu/nvgpu/common/linux/sim_gk20a.c
rename to drivers/gpu/nvgpu/common/linux/sim.c
index 6b148df6a..b7481784b 100644
--- a/drivers/gpu/nvgpu/common/linux/sim_gk20a.c
+++ b/drivers/gpu/nvgpu/common/linux/sim.c
@@ -22,7 +22,7 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
-#include "sim_gk20a.h"
+#include "sim.h"
 
 #include <nvgpu/hw/gk20a/hw_sim_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/sim_gk20a.h b/drivers/gpu/nvgpu/common/linux/sim.h
similarity index 90%
rename from drivers/gpu/nvgpu/common/linux/sim_gk20a.h
rename to drivers/gpu/nvgpu/common/linux/sim.h
index c2d975b15..a9ec0dba5 100644
--- a/drivers/gpu/nvgpu/common/linux/sim_gk20a.h
+++ b/drivers/gpu/nvgpu/common/linux/sim.h
@@ -1,5 +1,4 @@
 /*
- * drivers/video/tegra/host/gk20a/sim_gk20a.h
  *
  * GK20A sim support
  *
@@ -18,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIM_GK20A_LINUX_H__
-#define __SIM_GK20A_LINUX_H__
+#ifndef __SIM_LINUX_H__
+#define __SIM_LINUX_H__
 
 #include "gk20a/sim_gk20a.h"