diff --git a/sr_port/zshow_svn.c b/sr_port/zshow_svn.c
index 6c2513adb..b84c73310 100644
--- a/sr_port/zshow_svn.c
+++ b/sr_port/zshow_svn.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
- * Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries.	*
+ * Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.*
  * All rights reserved.						*
  *								*
  *	This source code contains the intellectual property	*
@@ -59,7 +59,7 @@
 #define ZS_ONE_OUT(V,TEXT) 	((V)->len = 1, (V)->addr = (TEXT), zshow_output(output,V))
 #define ZS_VAR_EQU(V,TEXT) 	((V)->len = SIZEOF(TEXT) - 1, (V)->addr = TEXT, \
 				 zshow_output(output,(V)), ZS_ONE_OUT((V),equal_text))
-				/* PATH_MAX + "->" + GTM-W-ZDIROUTOFSYNC, <text of ZDIROUTOFSYNC> */
+				/* PATH_MAX + "->" + YDB-W-ZDIROUTOFSYNC, <text of ZDIROUTOFSYNC> */
 #define ZDIR_ERR_LEN		((3 * GTM_MAX_DIR_LEN) + 128)
 
 
diff --git a/sr_unix/gtmsecshr_wrapper.c b/sr_unix/gtmsecshr_wrapper.c
index e628888e3..bef4585cd 100644
--- a/sr_unix/gtmsecshr_wrapper.c
+++ b/sr_unix/gtmsecshr_wrapper.c
@@ -96,7 +96,7 @@ extern	char	**environ;
 #define ERR_SECSHRCHDIRFAILED1			\
 	"%%YDB-E-SECSHRCHDIRFAILED1, chdir failed on %s, errno %d. gtmsecshr will not be started\n"
 #define ERR_SECSHRCHDIRFAILED2			\
-	"%%GTM-W-SECSHRCHDIRFAILED2, chdir failed on %s, errno %d. gtmsecshr will be started with GMT timezone\n"
+	"%%YDB-W-SECSHRCHDIRFAILED2, chdir failed on %s, errno %d. gtmsecshr will be started with GMT timezone\n"
 #define ERR_SECSHREXECLFAILED			\
 	"%%YDB-E-SECSHREXECLFAILED, execl of %s failed\n"
 #define ERR_SECSHRYDBDIST2LONG			\
@@ -120,7 +120,7 @@ extern	char	**environ;
 #define ERR_SECSHRSTATFAILED			\
 	"%%YDB-E-SECSHRSTATFAILED, stat failed on %s, errno %d. gtmsecshr will not be started\n"
 #define ERR_SECSHRTZFAIL			\
-	"%%GTM-W-SECSHRTZFAIL, %s %d. gtmsecshr will start with TZ set to GMT\n"
+	"%%YDB-W-SECSHRTZFAIL, %s %d. gtmsecshr will start with TZ set to GMT\n"
 #define ERR_SECSHRWRITABLE			\
 	"%%YDB-E-SECSHRWRITABLE, %s writable. gtmsecshr will not be started\n"