diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 28a04ce8f8..534e0f2bd2 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -2650,12 +2650,11 @@ static ldl_status handle_signalling(ldl_handle_t * handle, ldl_session_t * dlses
 																			  cid_name,
 																			  cid_num,
 																			  ldl_session_get_ip(dlsession),
-																			  ldl_session_get_value(dlsession,
-																									"ani"),
-																			  ldl_session_get_value(dlsession,
-																									"aniii"),
-																			  ldl_session_get_value(dlsession,
-																									"rdnis"), (char *) modname, context,
+																			  ldl_session_get_value(dlsession, "ani"),
+																			  ldl_session_get_value(dlsession, "aniii"),
+																			  ldl_session_get_value(dlsession, "rdnis"),
+																			  modname,
+																			  context,
 																			  exten)) != 0) {
 						char name[128];
 						snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number);
diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 4acde49b6e..7e50208512 100644
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -1107,8 +1107,9 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime)
 																				  iaxevent->ies.calling_ani,
 																				  NULL,
 																				  NULL,
-																				  (char *) modname,
-																				  iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) {
+																				  modname,
+																				  iaxevent->ies.called_context,
+																				  iaxevent->ies.called_number)) != 0) {
 							char name[128];
 							snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
 							switch_channel_set_name(channel, name);
diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 58f964635d..a6e7ede7c6 100644
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -1600,8 +1600,8 @@ static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t
 		}
 
 		if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
-																  NULL,
-																  dialplan, cid_name, cid_num, NULL, NULL, NULL, NULL, (char *) modname, NULL,
+																  NULL, dialplan, cid_name, cid_num,
+																  NULL, NULL, NULL, NULL, modname, NULL,
 																  dest)) != 0) {
 			char name[128];
 			snprintf(name, sizeof(name), "PortAudio/%s",
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 88e8edcbf9..50f80b7c36 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1935,7 +1935,10 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 	tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
 														 from_user,
 														 profile->dialplan,
-														 displayname, from_user, network_ip, NULL, NULL, NULL, MODNAME, context, destination_number);
+														 displayname,
+														 from_user,
+														 network_ip,
+														 NULL, NULL, NULL, MODNAME, context, destination_number);
 
 	if (tech_pvt->caller_profile) {
 
diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c
index 5ac6078786..70357cd493 100644
--- a/src/mod/endpoints/mod_woomera/mod_woomera.c
+++ b/src/mod/endpoints/mod_woomera/mod_woomera.c
@@ -1059,7 +1059,15 @@ static void *woomera_channel_thread_run(switch_thread_t * thread, void *obj)
 				if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
 																		  NULL,
 																		  tech_pvt->profile->dialplan,
-																		  cid_name, cid_num, ip, NULL, NULL, NULL, (char *) modname, NULL, exten)) != 0) {
+																		  cid_name,
+																		  cid_num,
+																		  ip,
+																		  NULL,
+																		  NULL,
+																		  NULL,
+																		  modname,
+																		  NULL,
+																		  exten)) != 0) {
 					char name[128];
 					snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
 					switch_channel_set_name(channel, name);
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index a493b12fbe..c6cd33553a 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -2430,9 +2430,8 @@ static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsva
 			return JS_FALSE;
 		}
 
-		caller_profile = switch_caller_profile_new(pool,
-												   username, dialplan, cid_name, cid_num, network_addr, ani, aniii, rdnis, (char *) modname, context,
-												   dest);
+		caller_profile = switch_caller_profile_new(pool,username, dialplan, cid_name, cid_num, network_addr,
+												   ani, aniii, rdnis, modname, context, dest);
 
 		if (switch_ivr_originate(session, &peer_session, &jss->cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest);
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 2005d5c2f4..fe75d19f3a 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -500,10 +500,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 						}
 
 						new_profile = switch_caller_profile_new(pool,
-																 NULL,
-																 NULL,
-																 cid_name_override, cid_num_override, NULL, NULL, NULL, NULL, __FILE__, NULL,
-																 chan_data);
+																NULL,
+																NULL,
+																cid_name_override,
+																cid_num_override,
+																NULL, NULL, NULL, NULL, __FILE__, NULL,
+																chan_data);
 					}
 				}