diff --git a/conf/autoload_configs/local_stream.conf.xml b/conf/autoload_configs/local_stream.conf.xml
index 4c67d6494e..d5c037524e 100755
--- a/conf/autoload_configs/local_stream.conf.xml
+++ b/conf/autoload_configs/local_stream.conf.xml
@@ -1,11 +1,11 @@
 <configuration name="local_stream.conf" description="stream files from local dir">
-<directory name="moh_8000" path="$${base_dir}/sounds/music/8000">
+<directory name="moh/8000" path="$${base_dir}/sounds/music/8000">
   <param name="rate" value="8000"/>
   <param name="channels" value="1"/>
   <param name="interval" value="2"/>
   <param name="timer_name" value="soft"/>
 </directory>
-<directory name="moh_16000" path="$${base_dir}/sounds/music/16000">
+<directory name="moh/16000" path="$${base_dir}/sounds/music/16000">
   <param name="rate" value="16000"/>
   <param name="channels" value="1"/>
   <param name="interval" value="2"/>
diff --git a/conf/lang/en/en.xml b/conf/lang/en/en.xml
index 7b190bad8d..3fe45ae739 100644
--- a/conf/lang/en/en.xml
+++ b/conf/lang/en/en.xml
@@ -1,5 +1,5 @@
 <include>
-  <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="callie">
+  <language name="en" sound-path="$${base_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
     <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
     <!--voicemail_en_tts is purely implemented with tts, we need a files based implementation too -->
     <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/>
diff --git a/conf/sip_profiles/default.xml b/conf/sip_profiles/default.xml
index 2ddf750ec2..c0c57d6be9 100644
--- a/conf/sip_profiles/default.xml
+++ b/conf/sip_profiles/default.xml
@@ -26,7 +26,7 @@
     <param name="rtp-timer-name" value="soft"/>
     <param name="rtp-ip" value="$${local_ip_v4}"/>
     <param name="sip-ip" value="$${local_ip_v4}"/>
-    <param name="hold-music" value="local_stream://moh_8000"/>
+    <param name="hold-music" value="local_stream://moh"/>
     <!--enable to use presense and mwi -->
     <param name="manage-presence" value="true"/>
     <!--max number of open dialogs in proceeding -->
diff --git a/conf/sip_profiles/nat.xml b/conf/sip_profiles/nat.xml
index 96bb47a2d5..5a9c3007ee 100644
--- a/conf/sip_profiles/nat.xml
+++ b/conf/sip_profiles/nat.xml
@@ -13,7 +13,7 @@
     <param name="dtmf-duration" value="100"/>
     <param name="codec-prefs" value="$${global_codec_prefs}"/>
     <param name="use-rtp-timer" value="true"/>
-    <param name="hold-music" value="local_stream://moh_8000"/>
+    <param name="hold-music" value="local_stream://moh"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="true"/>
     <param name="inbound-codec-negotiation" value="generous"/>
diff --git a/conf/sip_profiles/outbound.xml b/conf/sip_profiles/outbound.xml
index 066aa9a505..b1b108a48c 100644
--- a/conf/sip_profiles/outbound.xml
+++ b/conf/sip_profiles/outbound.xml
@@ -17,7 +17,7 @@
     <param name="context" value="public"/>
     <param name="dtmf-duration" value="100"/>
     <param name="codec-prefs" value="$${global_codec_prefs}"/>
-    <param name="hold-music" value="local_stream://moh_8000"/>
+    <param name="hold-music" value="local_stream://moh"/>
     <param name="use-rtp-timer" value="true"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="true"/>