diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index 8006297ddd..d7130fd2d2 100644
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -8,7 +8,7 @@
 #include <signal.h>
 
 #define CMD_BUFLEN 1024
-#define PROMPT_PREFIX "sangoma-media-gateway"
+#define PROMPT_PREFIX "netborder-ss7"
 static int WARN_STOP = 0;
 
 #ifdef WIN32
@@ -854,7 +854,7 @@ static void print_banner(FILE *stream)
 
 			"\n"
 			"*******************************************************\n"
-			"* Sangoma Media Gateway                               *\n"
+			"* Netborder SS7 Gateway                               *\n"
 			"* Powered by FreeSWITCH (http://www.freeswitch.org)   *\n"
 			"*******************************************************\n"
 			"\n"
@@ -1002,13 +1002,13 @@ int main(int argc, char *argv[])
 	int rv = 0;
 
 #ifndef WIN32
-	char hfile[512] = "/etc/smg_cli_history";
-	char cfile[512] = "/etc/smg_cli.conf";
-	char dft_cfile[512] = "/etc/smg_cli.conf";
+	char hfile[512] = "/etc/nbess7_cli_history";
+	char cfile[512] = "/etc/nbess7_cli.conf";
+	char dft_cfile[512] = "/etc/nbess7_cli.conf";
 #else
-	char hfile[512] = "smg_cli_history";
-	char cfile[512] = "smg_cli.conf";
-	char dft_cfile[512] = "smg_cli.conf";
+	char hfile[512] = "nbess7_cli_history";
+	char cfile[512] = "nbess7_cli.conf";
+	char dft_cfile[512] = "nbess7_cli.conf";
 #endif
 	char *home = getenv("HOME");
 	/* Vars for optargs */
@@ -1054,8 +1054,8 @@ int main(int argc, char *argv[])
 
 
 	if (home) {
-		snprintf(hfile, sizeof(hfile), "%s/.smg_cli_history", home);
-		snprintf(cfile, sizeof(cfile), "%s/.smg_cli_conf", home);
+		snprintf(hfile, sizeof(hfile), "%s/.nbess7_cli_history", home);
+		snprintf(cfile, sizeof(cfile), "%s/.nbess7_cli_conf", home);
 	}
 	
 	signal(SIGINT, handle_SIGINT);
@@ -1368,7 +1368,7 @@ int main(int argc, char *argv[])
 
 	print_banner(stdout);
 
-	esl_log(ESL_LOG_INFO, "Sangoma Media Gateway CLI Ready.\nenter /help for a list of commands.\n");
+	esl_log(ESL_LOG_INFO, "Netborder SS7 CLI Ready.\nenter /help for a list of commands.\n");
 	printf("%s\n", handle.last_sr_reply);
 
 	while (running > 0) {
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 01aa8412a1..75efdd6e40 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -90,7 +90,7 @@ typedef struct private_object private_object_t;
 
 #define MULTICAST_EVENT "multicast::event"
 #define SOFIA_REPLACES_HEADER "_sofia_replaces_"
-#define SOFIA_USER_AGENT "SangomaMediaGateway/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "-" SWITCH_VERSION_REVISION
+#define SOFIA_USER_AGENT "NetborderSS7/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "-" SWITCH_VERSION_REVISION
 #define SOFIA_CHAT_PROTO "sip"
 #define SOFIA_MULTIPART_PREFIX "sip_mp_"
 #define SOFIA_MULTIPART_PREFIX_T "~sip_mp_"
diff --git a/src/switch.c b/src/switch.c
index de99a905e5..7633fcae9f 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -48,7 +48,7 @@
 #include "private/switch_core_pvt.h"
 
 /* pid filename: Stores the process id of the freeswitch process */
-#define PIDFILE "sangoma-media-gateway.pid"
+#define PIDFILE "netborder-ss7.pid"
 static char *pfile = PIDFILE;
 static int system_ready = 0;
 
@@ -540,7 +540,7 @@ int main(int argc, char *argv[])
 		}
 
 		if (local_argv[x] && !strcmp(local_argv[x], "-version")) {
-			fprintf(stdout, "Sangoma Media Gateway Version: %s\n", SWITCH_VERSION_FULL);
+			fprintf(stdout, "Netborder SS7 Version: %s\n", SWITCH_VERSION_FULL);
 			return 0;
 			known_opt++;
 		}
diff --git a/src/switch_core.c b/src/switch_core.c
index 07aca5752e..0d7bfa8a11 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1758,17 +1758,16 @@ SWITCH_DECLARE(const char *) switch_core_banner(void)
 			"* Brought to you by ClueCon http://www.cluecon.com/        *\n" "************************************************************\n" "\n");
 #else
 	return (
-"\n _____                                          ___  ___         _ _         _____       _                            \n"
-"/  ___|                                         |  \\/  |        | (_)       |  __ \\     | |                           \n"
-"\\ `--.  __ _ _ __   __ _  ___  _ __ ___   __ _  | .  . | ___  __| |_  __ _  | |  \\/ __ _| |_  _____      ____ _ _   _ \n"
-" `--. \\/ _` | '_ \\ / _` |/ _ \\| '_ ` _ \\ / _` | | |\\/| |/ _ \\/ _` | |/ _` | | | __ / _` | __|/ _ \\ \\ /\\ / / _` | | | |\n"
-"/\\__/ / (_| | | | | (_| | (_) | | | | | | (_| | | |  | |  __/ (_| | | (_| | | |_\\ \\ (_| | |_|  __/\\ V  V / (_| | |_| |\n"
-"\\____/ \\__,_|_| |_|\\__, |\\___/|_| |_| |_|\\__,_| \\_|  |_/\\___|\\__,_|_|\\__,_|  \\____/\\__,_|\\__|\\___| \\_/\\_/ \\__,_|\\__, |\n"
-"                    __/ |                                                                                        __/ |\n"
-"                   |___/                                                                                        |___/ \n"
-			"************************************************************\n"
-			"* Powered by: FreeSWITCH (http://www.freeswitch.org)       *\n" 
-                        "************************************************************\n" "\n");
+			"************************************************************************\n"
+			"*    .__   __. .______    _______         _______.     _______. ______ *\n" 
+			"*    |  \ |  | |   _  \  |   ____|       /       |    /       ||____  |*\n" 
+			"*    |   \|  | |  |_)  | |  |__         |   (----`   |   (----`    / / *\n" 
+			"*    |  . `  | |   _  <  |   __|         \   \        \   \       / /  *\n" 
+			"*    |  |\   | |  |_)  | |  |____    .----)   |   .----)   |     / /   *\n" 
+			"*    |__| \__| |______/  |_______|   |_______/    |_______/     /_/    *\n" 
+			"*                                                                      *\n"
+			"*    Powered by: FreeSWITCH (http://www.freeswitch.org)                *\n" 
+                        "**************************************************************************\n" "\n");
 #endif
 }