diff --git a/conf/vanilla/autoload_configs/voicemail.conf.xml b/conf/vanilla/autoload_configs/voicemail.conf.xml
index 8052d611f1..33d5a97760 100644
--- a/conf/vanilla/autoload_configs/voicemail.conf.xml
+++ b/conf/vanilla/autoload_configs/voicemail.conf.xml
@@ -64,7 +64,7 @@
         <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
         <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
       </email>
-      <!--<param name="storage-dir" value="$${storage}"/>-->
+      <!--<param name="storage-dir" value="$${storage_dir}"/>-->
       <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
       <!--<param name="record-comment" value="Your Comment"/>-->
       <!--<param name="record-title" value="Your Title"/>-->
diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml
index 0b161854ff..28a6dc96fb 100644
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@@ -38,7 +38,7 @@
       temp_dir
       grammar_dir
       certs_dir
-      storage
+      storage_dir
       cache_dir
       core_uuid
       zrtp_enabled
diff --git a/src/switch_core.c b/src/switch_core.c
index 7d5af36c28..bf07f46451 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1738,7 +1738,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 	switch_core_set_variable("temp_dir", SWITCH_GLOBAL_dirs.temp_dir);
 	switch_core_set_variable("grammar_dir", SWITCH_GLOBAL_dirs.grammar_dir);
 	switch_core_set_variable("certs_dir", SWITCH_GLOBAL_dirs.certs_dir);
-	switch_core_set_variable("storage", SWITCH_GLOBAL_dirs.storage_dir);
+	switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);
 	switch_core_set_variable("cache_dir", SWITCH_GLOBAL_dirs.cache_dir);
 	switch_core_set_serial();