diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index f30043a77..bf72bda49 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -2236,7 +2236,7 @@ static bool nvgpu_channel_ctxsw_timeout_debug_dump_state(struct gk20a *g,
 		struct nvgpu_channel *ch)
 {
 	bool verbose = false;
-	if (nvgpu_is_error_notifier_set(ch,
+	if (nvgpu_is_err_notifier_set(ch,
 			NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT)) {
 		verbose = ch->ctxsw_timeout_debug_dump;
 	}
diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
index f0680b674..f7f48214c 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -567,7 +567,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier,
+		.set_error_notifier = nvgpu_set_err_notifier,
 		.debug_dump = NULL,
 	},
 	.tsg = {
diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
index f0999aee5..74d600aa4 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -654,7 +654,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier,
+		.set_error_notifier = nvgpu_set_err_notifier,
 		.debug_dump = NULL,
 	},
 	.tsg = {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
index 2375645cd..6332fc254 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
@@ -760,7 +760,7 @@ static const struct gpu_ops gm20b_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier,
+		.set_error_notifier = nvgpu_set_err_notifier,
 		.debug_dump = gk20a_channel_debug_dump,
 	},
 	.tsg = {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
index 5dcfd9961..506beaf8e 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
@@ -846,7 +846,7 @@ static const struct gpu_ops gp10b_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier,
+		.set_error_notifier = nvgpu_set_err_notifier,
 		.debug_dump = gk20a_channel_debug_dump,
 	},
 	.tsg = {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
index 8daf4d069..7b4a44949 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
@@ -981,7 +981,7 @@ static const struct gpu_ops gv11b_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier_if_empty,
+		.set_error_notifier = nvgpu_set_err_notifier_if_empty,
 		.reset_faulted = gv11b_channel_reset_faulted,
 		.debug_dump = gv11b_channel_debug_dump,
 	},
diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
index be720da08..05ed27961 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
@@ -1025,7 +1025,7 @@ static const struct gpu_ops tu104_ops = {
                         nvgpu_channel_suspend_all_serviceable_ch,
 		.resume_all_serviceable_ch =
                         nvgpu_channel_resume_all_serviceable_ch,
-		.set_error_notifier = nvgpu_set_error_notifier_if_empty,
+		.set_error_notifier = nvgpu_set_err_notifier_if_empty,
 		.reset_faulted = gv11b_channel_reset_faulted,
 		.debug_dump = gv11b_channel_debug_dump,
 	},
diff --git a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
index 191a2c75e..e5bef489b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -41,9 +41,9 @@ enum {
 	NVGPU_ERR_NOTIFIER_PBDMA_PUSHBUFFER_CRC_MISMATCH,
 };
 
-void nvgpu_set_error_notifier_locked(struct nvgpu_channel *ch, u32 error);
-void nvgpu_set_error_notifier(struct nvgpu_channel *ch, u32 error);
-void nvgpu_set_error_notifier_if_empty(struct nvgpu_channel *ch, u32 error);
-bool nvgpu_is_error_notifier_set(struct nvgpu_channel *ch, u32 error_notifier);
+void nvgpu_set_err_notifier_locked(struct nvgpu_channel *ch, u32 error);
+void nvgpu_set_err_notifier(struct nvgpu_channel *ch, u32 error);
+void nvgpu_set_err_notifier_if_empty(struct nvgpu_channel *ch, u32 error);
+bool nvgpu_is_err_notifier_set(struct nvgpu_channel *ch, u32 error_notifier);
 
 #endif /* NVGPU_ERROR_NOTIFIER_H */
diff --git a/drivers/gpu/nvgpu/os/linux/linux-channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c
index f9c0a9be3..6ae91f141 100644
--- a/drivers/gpu/nvgpu/os/linux/linux-channel.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c
@@ -108,12 +108,12 @@ static u32 nvgpu_error_notifier_to_channel_notifier(u32 error_notifier)
 }
 
 /**
- * nvgpu_set_error_notifier_locked()
+ * nvgpu_set_err_notifier_locked()
  * Should be called with ch->error_notifier_mutex held
  *
  * error should be of the form  NVGPU_ERR_NOTIFIER_*
  */
-void nvgpu_set_error_notifier_locked(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier_locked(struct nvgpu_channel *ch, u32 error)
 {
 	struct nvgpu_channel_linux *priv = ch->os_priv;
 
@@ -141,16 +141,16 @@ void nvgpu_set_error_notifier_locked(struct nvgpu_channel *ch, u32 error)
 }
 
 /* error should be of the form  NVGPU_ERR_NOTIFIER_* */
-void nvgpu_set_error_notifier(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier(struct nvgpu_channel *ch, u32 error)
 {
 	struct nvgpu_channel_linux *priv = ch->os_priv;
 
 	nvgpu_mutex_acquire(&priv->error_notifier.mutex);
-	nvgpu_set_error_notifier_locked(ch, error);
+	nvgpu_set_err_notifier_locked(ch, error);
 	nvgpu_mutex_release(&priv->error_notifier.mutex);
 }
 
-void nvgpu_set_error_notifier_if_empty(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier_if_empty(struct nvgpu_channel *ch, u32 error)
 {
 	struct nvgpu_channel_linux *priv = ch->os_priv;
 
@@ -161,13 +161,13 @@ void nvgpu_set_error_notifier_if_empty(struct nvgpu_channel *ch, u32 error)
 
 		/* Don't overwrite error flag if it is already set */
 		if (notification->status != 0xffff)
-			nvgpu_set_error_notifier_locked(ch, error);
+			nvgpu_set_err_notifier_locked(ch, error);
 	}
 	nvgpu_mutex_release(&priv->error_notifier.mutex);
 }
 
 /* error_notifier should be of the form  NVGPU_ERR_NOTIFIER_* */
-bool nvgpu_is_error_notifier_set(struct nvgpu_channel *ch, u32 error_notifier)
+bool nvgpu_is_err_notifier_set(struct nvgpu_channel *ch, u32 error_notifier)
 {
 	struct nvgpu_channel_linux *priv = ch->os_priv;
 	bool notifier_set = false;
diff --git a/drivers/gpu/nvgpu/os/posix/error_notifier.c b/drivers/gpu/nvgpu/os/posix/error_notifier.c
index f07f9cbbe..956119c1b 100644
--- a/drivers/gpu/nvgpu/os/posix/error_notifier.c
+++ b/drivers/gpu/nvgpu/os/posix/error_notifier.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,19 +22,19 @@
 
 #include <nvgpu/error_notifier.h>
 
-void nvgpu_set_error_notifier_locked(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier_locked(struct nvgpu_channel *ch, u32 error)
 {
 }
 
-void nvgpu_set_error_notifier(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier(struct nvgpu_channel *ch, u32 error)
 {
 }
 
-void nvgpu_set_error_notifier_if_empty(struct nvgpu_channel *ch, u32 error)
+void nvgpu_set_err_notifier_if_empty(struct nvgpu_channel *ch, u32 error)
 {
 }
 
-bool nvgpu_is_error_notifier_set(struct nvgpu_channel *ch, u32 error_notifier)
+bool nvgpu_is_err_notifier_set(struct nvgpu_channel *ch, u32 error_notifier)
 {
 	return false;
 }