diff --git a/conf/mod_cdr.conf.xml b/conf/cdr.conf.xml
similarity index 100%
rename from conf/mod_cdr.conf.xml
rename to conf/cdr.conf.xml
diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index e0b2375e0e..3937fb033f 100644
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -44,7 +44,7 @@
     <!-- none for mod_xml_cdr -->
 
     <!-- Event Handlers -->
-    <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/>
+    <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/>
     <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/>
     <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/>
     <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/>
@@ -88,11 +88,11 @@
     <!-- ASR /TTS -->
     <!-- none for mod_cepstral -->
     <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="mod_openmrcp.conf.xml"/>
+    <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/>
 
     <!-- Say -->
     <!-- none for mod_say_en -->
-    <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/>
+    <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/>
   </section>
   
   <section name="dialplan" description="Regex/XML Dialplan">
diff --git a/conf/mod_local_stream.conf.xml b/conf/local_stream.conf.xml
similarity index 100%
rename from conf/mod_local_stream.conf.xml
rename to conf/local_stream.conf.xml
diff --git a/conf/mod_openmrcp.conf.xml b/conf/openmrcp.conf.xml
similarity index 100%
rename from conf/mod_openmrcp.conf.xml
rename to conf/openmrcp.conf.xml