diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index 8e2bc2964a..109665cfbc 100644
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -67,9 +67,9 @@
         <!-- <param name="ip" value="1.2.3.4"> -->
         <param name="port" value="4569"/>
         <param name="dialplan" value="XML"/>
-        <param name="codec_prefs" value="PCMU,PCMA,speex,L16"/>
-        <param name="codec_master" value="us"/>
-        <param name="codec_rates" value="8"/>
+        <param name="codec-prefs" value="PCMU,PCMA,speex,L16"/>
+        <param name="codec-master" value="us"/>
+        <param name="codec-rates" value="8"/>
       </settings>
     </configuration>
   
@@ -104,8 +104,8 @@
       <settings>
         <param name="port" value="5060"/>
         <param name="dialplan" value="XML"/>
-        <param name="dtmf_duration" value="100"/>
-        <param name="codec_prefs" value="PCMU,PCMA"/>
+        <param name="dtmf-duration" value="100"/>
+        <param name="codec-prefs" value="PCMU,PCMA"/>
         <!-- pick one (default if not specified is 'guess'); -->
         <param name="rtp-ip" value="guess"/>
         <!-- <param name-"rtp-ip" value="10.0.0.1"/> -->
@@ -139,9 +139,9 @@
         <param name="debug" value="1"/>
         <param name="dialplan" value="XML"/>
         <param name="mtu" value="320"/>
-        <param name="dtmf_on" value="800"/>
-        <param name="dtmf_off" value="100"/>
-        <param name="supress_dtmf_tone" value="yes"/>
+        <param name="dtmf-on" value="800"/>
+        <param name="dtmf-off" value="100"/>
+        <param name="supress-dtmf-tone" value="yes"/>
       </settings>
       <span>
         <param name="span" value="1"/>
@@ -175,8 +175,8 @@
         <param name="indev" value="USB"/>
         <param name="outdev" value="USB"/>
   
-        <param name="cid_name" value="FreeSwitch"/>
-        <param name="cid_num" value="5555551212"/>
+        <param name="cid-name" value="FreeSwitch"/>
+        <param name="cid-num" value="5555551212"/>
       </settings>
     </configuration>
   
@@ -192,13 +192,13 @@
         <param name="#debug" value="1"/>
         <param name="jid" value="freeswitch@my.jabber.com/me"/>
         <param name="passwd" value="mypass"/>
-        <param name="target_jid" value="freeswitch@reader.org/him"/>
+        <param name="target-jid" value="freeswitch@reader.org/him"/>
       </settings>
     </configuration>
   
     <configuration name="dialplan_directory.conf" description="Dialplan Directory">
       <settings>
-        <param name="directory_name" value="ldap"/>
+        <param name="directory-name" value="ldap"/>
         <param name="host" value="ldap.freeswitch.org"/>
         <param name="dn" value="cn=Manager,dc=freeswitch,dc=org"/>
         <param name="pass" value="test"/>
@@ -209,7 +209,7 @@
     <configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
       <settings>
         <param name="debug" value="0"/>
-        <param name="codec_prefs" value="PCMU"/>
+        <param name="codec-prefs" value="PCMU"/>
       </settings>
       <!-- *NOTE* your resource (after the /) MUST contain the string "talk" (upper or lower case is ok) -->
       <!-- *NOTE* as of May 2 2006 you must set"auto-login" to"true" if you want to be able to auto-login on startup"/> -->
@@ -235,12 +235,12 @@
     <configuration name="xml_rpc.conf" description="XML RPC">
       <settings>
 	<!-- The port where you want to run the http service (default 8080) -->
-	<param name="http_port" value="8080"/>
+	<param name="http-port" value="8080"/>
         <!-- The url to a gateway cgi that can generate xml similar to
         what's in this file only on-the-fly (leave it commented if you dont
         need it) -->
 	<!-- one or more |-delim of configuration|directory|dialplan -->
-        <!-- <param name="gateway_url" value="http://www.server.com/gateway.cgi" bindings="configuration"/> -->
+        <!-- <param name="gateway-url" value="http://www.server.com/gateway.cgi" bindings="configuration"/> -->
       </settings>
     </configuration>
   </section>
diff --git a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
index 4e9a40c694..3dcb8d1ee6 100644
--- a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
+++ b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c
@@ -67,9 +67,7 @@ static void load_config(void)
 			char *var = (char *) switch_xml_attr(param, "name");
 			char *val = (char *) switch_xml_attr(param, "value");
 
-			if (!strcmp(var, "directory_name") && val) {
-				set_global_directory_name(val);
-			} else if (!strcmp(var, "directory_name") && val) {
+			if (!strcmp(var, "directory-name") && val) {
 				set_global_directory_name(val);
 			} else if (!strcmp(var, "host") && val) {
 				set_global_host(val);
diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 70c4a70de0..1cd1d9bc7b 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -1310,11 +1310,11 @@ static switch_status_t load_config(void)
 
 			if (!strcasecmp(var, "debug")) {
 				globals.debug = atoi(val);
-			} else if (!strcasecmp(var, "codec_prefs")) {
+			} else if (!strcasecmp(var, "codec-prefs")) {
 				set_global_codec_string(val);
 				globals.codec_order_last =
 					switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
-			} else if (!strcasecmp(var, "codec_rates")) {
+			} else if (!strcasecmp(var, "codec-rates")) {
 				set_global_codec_rates_string(val);
 				globals.codec_rates_last =
 					switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.c b/src/mod/endpoints/mod_exosip/mod_exosip.c
index 9325d20c01..5833f0d6da 100644
--- a/src/mod/endpoints/mod_exosip/mod_exosip.c
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.c
@@ -1912,12 +1912,12 @@ static int config_exosip(int reload)
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Add Realm [%s][%s]\n", name, val);
 					switch_core_hash_insert(globals.srtp_hash, switch_core_strdup(module_pool, name), switch_core_strdup(module_pool, val));
 				}
-			} else if (!strcmp(var, "codec_prefs")) {
+			} else if (!strcmp(var, "codec-prefs")) {
 				set_global_codec_string(val);
 				globals.codec_order_last = switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
-			} else if (!strcmp(var, "codec_ms")) {
+			} else if (!strcmp(var, "codec-ms")) {
 				globals.codec_ms = atoi(val);
-			} else if (!strcmp(var, "dtmf_duration")) {
+			} else if (!strcmp(var, "dtmf-duration")) {
 				int dur = atoi(val);
 				if (dur > 10 && dur < 8000) {
 					globals.dtmf_duration = dur;
diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 8bb79bfb60..54b6013c06 100644
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -838,17 +838,17 @@ static switch_status_t load_config(void)
 				globals.port = atoi(val);
 			} else if (!strcmp(var, "ip")) {
 				set_global_ip(val);
-			} else if (!strcmp(var, "codec_master")) {
+			} else if (!strcmp(var, "codec-master")) {
 				if (!strcasecmp(val, "us")) {
 					switch_set_flag(&globals, GFLAG_MY_CODEC_PREFS);
 				}
 			} else if (!strcmp(var, "dialplan")) {
 				set_global_dialplan(val);
-			} else if (!strcmp(var, "codec_prefs")) {
+			} else if (!strcmp(var, "codec-prefs")) {
 				set_global_codec_string(val);
 				globals.codec_order_last =
 					switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
-			} else if (!strcmp(var, "codec_rates")) {
+			} else if (!strcmp(var, "codec-rates")) {
 				set_global_codec_rates_string(val);
 				globals.codec_rates_last =
 					switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 1eefd74dc8..368526f567 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -583,13 +583,13 @@ static switch_status_t load_config(void)
 
 			if (!strcmp(var, "debug")) {
 				globals.debug = atoi(val);
-			} else if (!strcmp(var, "sample_rate")) {
+			} else if (!strcmp(var, "sample-rate")) {
 				globals.sample_rate = atoi(val);
 			} else if (!strcmp(var, "dialplan")) {
 				set_global_dialplan(val);
-			} else if (!strcmp(var, "cid_name")) {
+			} else if (!strcmp(var, "cid-name")) {
 				set_global_cid_name(val);
-			} else if (!strcmp(var, "cid_num")) {
+			} else if (!strcmp(var, "cid-num")) {
 				set_global_cid_num(val);
 			} else if (!strcmp(var, "indev")) {
 				if (*val == '#') {
diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index d99985595a..afef75e4f5 100644
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -1309,11 +1309,11 @@ static switch_status_t config_wanpipe(int reload)
 				globals.debug = atoi(val);
 			} else if (!strcmp(var, "mtu")) {
 				globals.mtu = atoi(val);
-			} else if (!strcmp(var, "dtmf_on")) {
+			} else if (!strcmp(var, "dtmf-on")) {
 				globals.dtmf_on = atoi(val);
-			} else if (!strcmp(var, "dtmf_off")) {
+			} else if (!strcmp(var, "dtmf-off")) {
 				globals.dtmf_off = atoi(val);
-			} else if (!strcmp(var, "supress_dtmf_tone")) {
+			} else if (!strcmp(var, "supress-dtmf-tone")) {
 				globals.supress_dtmf_tone = switch_true(val);
 			}
 		}
diff --git a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c
index c0d2a63d5b..a2b2b530e0 100644
--- a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c
+++ b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c
@@ -117,7 +117,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
 			if (!strcmp(var, "jid")) {
 				set_global_jid(val);
 				count++;
-			} else if (!strcmp(var, "target_jid")) {
+			} else if (!strcmp(var, "target-jid")) {
 				set_global_target_jid(val);
 				count++;
 			} else if (!strcmp(var, "passwd")) {
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
index 43ee569827..5a3c73ead6 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
@@ -149,11 +149,11 @@ static switch_status_t do_config(void)
 			char *var = (char *) switch_xml_attr(param, "name");
 			char *val = (char *) switch_xml_attr(param, "value");
 
-			if (!strcasecmp(var, "gateway_url")) {
+			if (!strcasecmp(var, "gateway-url")) {
 				char *bindings = (char *) switch_xml_attr(param, "bindings");
 				set_global_bindings(bindings);
 				set_global_url(val);
-			} else if (!strcasecmp(var, "http_port")) {
+			} else if (!strcasecmp(var, "http-port")) {
 				globals.port = (uint16_t)atoi(val);
 			}
 		}