diff --git a/src/vma/main.cpp b/src/vma/main.cpp
index af39db4f8..55fe21e1d 100644
--- a/src/vma/main.cpp
+++ b/src/vma/main.cpp
@@ -389,7 +389,7 @@ void print_vma_global_settings()
 	VLOG_STR_PARAM_STRING("Log File", safe_mce_sys().log_filename, MCE_DEFAULT_LOG_FILE, SYS_VAR_LOG_FILENAME, safe_mce_sys().log_filename);
 	VLOG_STR_PARAM_STRING("Stats File", safe_mce_sys().stats_filename, MCE_DEFAULT_STATS_FILE, SYS_VAR_STATS_FILENAME, safe_mce_sys().stats_filename);
 	VLOG_STR_PARAM_STRING("Stats shared memory directory", safe_mce_sys().stats_shmem_dirname, MCE_DEFAULT_STATS_SHMEM_DIR, SYS_VAR_STATS_SHMEM_DIRNAME, safe_mce_sys().stats_shmem_dirname);
-	VLOG_STR_PARAM_STRING("VMAD output directory", safe_mce_sys().vmad_notify_dir, MCE_DEFAULT_VMAD_FOLDER, SYS_VAR_VMAD_DIR, safe_mce_sys().vmad_notify_dir);
+	VLOG_STR_PARAM_STRING("SERVICE output directory", safe_mce_sys().service_notify_dir, MCE_DEFAULT_SERVICE_FOLDER, SYS_VAR_SERVICE_DIR, safe_mce_sys().service_notify_dir);
 	VLOG_PARAM_NUMBER("Stats FD Num (max)", safe_mce_sys().stats_fd_num_max, MCE_DEFAULT_STATS_FD_NUM, SYS_VAR_STATS_FD_NUM);
 	VLOG_STR_PARAM_STRING("Conf File", safe_mce_sys().conf_filename, MCE_DEFAULT_CONF_FILE, SYS_VAR_CONF_FILENAME, safe_mce_sys().conf_filename);
 	VLOG_STR_PARAM_STRING("Application ID", safe_mce_sys().app_id, MCE_DEFAULT_APP_ID, SYS_VAR_APPLICATION_ID, safe_mce_sys().app_id);
diff --git a/src/vma/util/agent.cpp b/src/vma/util/agent.cpp
index e05aefc93..ab41a622e 100644
--- a/src/vma/util/agent.cpp
+++ b/src/vma/util/agent.cpp
@@ -72,12 +72,12 @@
 #define output_fatal() \
 	do { \
 		vlog_levels_t _level = (mce_sys_var::HYPER_MSHV == safe_mce_sys().hypervisor ?          \
-						VLOG_WARNING : VLOG_DEBUG);                                             \
+						VLOG_WARNING : VLOG_DEBUG); \
 		vlog_printf(_level, "*************************************************************\n"); \
-		if (rc == -EPROTONOSUPPORT)													        \
-			vlog_printf(_level, "* Protocol version mismatch was found between vma and vmad. *\n"); \
+		if (rc == -EPROTONOSUPPORT) \
+			vlog_printf(_level, "* Protocol version mismatch was found between the library and the service. *\n"); \
 		else 																			        \
-			vlog_printf(_level, "* Can not establish connection with the daemon (vmad).      *\n"); \
+			vlog_printf(_level, "* Can not establish connection with the service.      *\n"); \
 		vlog_printf(_level, "* UDP/TCP connections are likely to be limited.             *\n"); \
 		vlog_printf(_level, "*************************************************************\n"); \
 	} while (0)
@@ -100,7 +100,7 @@ agent::agent() :
 	/* Fill free queue with empty messages */
 	i = m_msg_num;
 	m_msg_num = 0;
-	const char *path = safe_mce_sys().vmad_notify_dir;
+	const char *path = safe_mce_sys().service_notify_dir;
 	while (i--) {
 		/* coverity[overwrite_var] */
 		msg = (agent_msg_t *)calloc(1, sizeof(*msg));
@@ -528,7 +528,7 @@ int agent::send_msg_init(void)
 	}
 
 	if (data.hdr.ver < VMA_AGENT_VER) {
-		__log_dbg("Protocol version mismatch: agent ver = 0x%X vmad ver = 0x%X",
+		__log_dbg("Protocol version mismatch: agent ver = 0x%X service ver = 0x%X",
 				VMA_AGENT_VER, data.hdr.ver);
 		rc = -EPROTONOSUPPORT;
 		goto err;
diff --git a/src/vma/util/sys_vars.cpp b/src/vma/util/sys_vars.cpp
index 6964dca8e..a923cfb38 100644
--- a/src/vma/util/sys_vars.cpp
+++ b/src/vma/util/sys_vars.cpp
@@ -503,9 +503,9 @@ void mce_sys_var::get_env_params()
 	memset(log_filename, 0, sizeof(log_filename));
 	memset(stats_filename, 0, sizeof(stats_filename));
 	memset(stats_shmem_dirname, 0, sizeof(stats_shmem_dirname));
-	memset(vmad_notify_dir, 0, sizeof(vmad_notify_dir));
+	memset(service_notify_dir, 0, sizeof(service_notify_dir));
 	strcpy(stats_filename, MCE_DEFAULT_STATS_FILE);
-	strcpy(vmad_notify_dir, MCE_DEFAULT_VMAD_FOLDER);
+	strcpy(service_notify_dir, MCE_DEFAULT_SERVICE_FOLDER);
 	strcpy(stats_shmem_dirname, MCE_DEFAULT_STATS_SHMEM_DIR);
 	strcpy(conf_filename, MCE_DEFAULT_CONF_FILE);
 	strcpy(app_id, MCE_DEFAULT_APP_ID);
@@ -800,8 +800,8 @@ void mce_sys_var::get_env_params()
 		read_env_variable_with_pid(conf_filename, sizeof(conf_filename), env_ptr);
 	}
 
-	if ((env_ptr = getenv(SYS_VAR_VMAD_DIR)) != NULL){
-		read_env_variable_with_pid(vmad_notify_dir, sizeof(vmad_notify_dir), env_ptr);
+	if ((env_ptr = getenv(SYS_VAR_SERVICE_DIR)) != NULL){
+		read_env_variable_with_pid(service_notify_dir, sizeof(service_notify_dir), env_ptr);
 	}
 
 	if ((env_ptr = getenv(SYS_VAR_LOG_LEVEL)) != NULL)
diff --git a/src/vma/util/sys_vars.h b/src/vma/util/sys_vars.h
index abd62d435..b013e946f 100644
--- a/src/vma/util/sys_vars.h
+++ b/src/vma/util/sys_vars.h
@@ -312,7 +312,7 @@ struct mce_sys_var {
 	char		stats_filename[PATH_MAX];
 	char		stats_shmem_dirname[PATH_MAX];
 	char 		conf_filename[PATH_MAX];
-	char		vmad_notify_dir[PATH_MAX];
+	char		service_notify_dir[PATH_MAX];
 	bool		log_colors;
 	bool 		handle_sigintr;
 	bool		handle_segfault;
@@ -456,7 +456,7 @@ extern mce_sys_var & safe_mce_sys();
 #define SYS_VAR_LOG_DETAILS				"VMA_LOG_DETAILS"
 #define SYS_VAR_LOG_FILENAME				"VMA_LOG_FILE"
 #define SYS_VAR_STATS_FILENAME				"VMA_STATS_FILE"
-#define SYS_VAR_VMAD_DIR				"VMA_VMAD_NOTIFY_DIR"
+#define SYS_VAR_SERVICE_DIR				"VMA_VMAD_NOTIFY_DIR"
 #define SYS_VAR_STATS_SHMEM_DIRNAME			"VMA_STATS_SHMEM_DIR"
 #define SYS_VAR_CONF_FILENAME				"VMA_CONFIG_FILE"
 #define SYS_VAR_LOG_COLORS				"VMA_LOG_COLORS"
@@ -575,7 +575,7 @@ extern mce_sys_var & safe_mce_sys();
 #define MCE_DEFAULT_LOG_FILE				("")
 #define MCE_DEFAULT_CONF_FILE				("/etc/libvma.conf")
 #define MCE_DEFAULT_STATS_FILE				("")
-#define MCE_DEFAULT_VMAD_FOLDER			(VMA_AGENT_PATH)
+#define MCE_DEFAULT_SERVICE_FOLDER                    (VMA_AGENT_PATH)
 #define MCE_DEFAULT_STATS_SHMEM_DIR			("/tmp/")
 #define MCE_DEFAULT_LOG_DETAILS				(0)
 #define MCE_DEFAULT_LOG_COLORS				(true)