diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c
index a0407d3a60a..3b13a065654 100644
--- a/src/modules/ims_auth/authorize.c
+++ b/src/modules/ims_auth/authorize.c
@@ -66,7 +66,7 @@
 #include "../../lib/ims/ims_getters.h"
 #include "../tm/tm_load.h"
 #include "api.h"
-#include "authims_mod.h"
+#include "ims_auth_mod.h"
 #include "authorize.h"
 #include "utils.h"
 #include "../../core/action.h" /* run_actions */
diff --git a/src/modules/ims_auth/authims_mod.c b/src/modules/ims_auth/ims_auth_mod.c
similarity index 99%
rename from src/modules/ims_auth/authims_mod.c
rename to src/modules/ims_auth/ims_auth_mod.c
index 152a3789e3b..6b3dfb4a367 100644
--- a/src/modules/ims_auth/authims_mod.c
+++ b/src/modules/ims_auth/ims_auth_mod.c
@@ -55,7 +55,7 @@
 #include "../cdp/cdp_load.h"
 #include "../tm/tm_load.h"
 #include "authorize.h"
-#include "authims_mod.h"
+#include "ims_auth_mod.h"
 #include "cxdx_mar.h"
 #include "../../lib/ims/useful_defs.h"
 #include "pvt_message.h"
diff --git a/src/modules/ims_auth/authims_mod.h b/src/modules/ims_auth/ims_auth_mod.h
similarity index 100%
rename from src/modules/ims_auth/authims_mod.h
rename to src/modules/ims_auth/ims_auth_mod.h
diff --git a/src/modules/ims_auth/stats.h b/src/modules/ims_auth/stats.h
index b05f3457949..321feed2792 100644
--- a/src/modules/ims_auth/stats.h
+++ b/src/modules/ims_auth/stats.h
@@ -45,7 +45,7 @@
 #define STATISTICS_H_
 
 #include "../../core/counters.h"
-#include "authims_mod.h"
+#include "ims_auth_mod.h"
 
 stat_var* stat_mar_timeouts;
 stat_var* mar_replies_received;
diff --git a/src/modules/ims_charging/ccr.c b/src/modules/ims_charging/ccr.c
index 93ca2e7c6b3..d15d0a43a13 100644
--- a/src/modules/ims_charging/ccr.c
+++ b/src/modules/ims_charging/ccr.c
@@ -3,7 +3,7 @@
 #include "ccr.h"
 #include "Ro_data.h"
 #include "ro_avp.h"
-#include "mod.h"
+#include "ims_charging_mod.h"
 
 extern cdp_avp_bind_t *cdp_avp;
 extern struct cdp_binds cdpb;
diff --git a/src/modules/ims_charging/dialog.c b/src/modules/ims_charging/dialog.c
index 4b8e14ebc9e..9b039981702 100644
--- a/src/modules/ims_charging/dialog.c
+++ b/src/modules/ims_charging/dialog.c
@@ -1,4 +1,4 @@
-#include "mod.h"
+#include "ims_charging_mod.h"
 #include "dialog.h"
 #include "ro_session_hash.h"
 #include "ro_db_handler.h"
diff --git a/src/modules/ims_charging/mod.c b/src/modules/ims_charging/ims_charging_mod.c
similarity index 99%
rename from src/modules/ims_charging/mod.c
rename to src/modules/ims_charging/ims_charging_mod.c
index 547106038a7..a30ae6591f3 100644
--- a/src/modules/ims_charging/mod.c
+++ b/src/modules/ims_charging/ims_charging_mod.c
@@ -5,7 +5,7 @@
  *      Author: jaybeepee
  */
 
-#include "mod.h"
+#include "ims_charging_mod.h"
 #include "../../core/sr_module.h"
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../../modules/ims_dialog/dlg_hash.h"
diff --git a/src/modules/ims_charging/mod.h b/src/modules/ims_charging/ims_charging_mod.h
similarity index 100%
rename from src/modules/ims_charging/mod.h
rename to src/modules/ims_charging/ims_charging_mod.h
diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c
index 728eb70fe50..6ec78b9f4da 100644
--- a/src/modules/ims_charging/ims_ro.c
+++ b/src/modules/ims_charging/ims_ro.c
@@ -1,4 +1,4 @@
-#include "mod.h"
+#include "ims_charging_mod.h"
 
 #include <math.h>
 #include "../../core/parser/msg_parser.h"
diff --git a/src/modules/ims_charging/ro_timer.c b/src/modules/ims_charging/ro_timer.c
index c595a338982..38af8cbdca3 100644
--- a/src/modules/ims_charging/ro_timer.c
+++ b/src/modules/ims_charging/ro_timer.c
@@ -16,7 +16,7 @@
 #include "ro_session_hash.h"
 #include "ims_ro.h"
 #include "ro_db_handler.h"
-#include "mod.h"
+#include "ims_charging_mod.h"
 #include "ims_charging_stats.h"
 #include "../../core/counters.h"
 
diff --git a/src/modules/ims_icscf/cxdx_lir.c b/src/modules/ims_icscf/cxdx_lir.c
index efc04134858..473d3aa1395 100644
--- a/src/modules/ims_icscf/cxdx_lir.c
+++ b/src/modules/ims_icscf/cxdx_lir.c
@@ -48,7 +48,7 @@
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "cxdx_avp.h"
 #include "cxdx_lir.h"
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include "location.h"
 
 //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable
diff --git a/src/modules/ims_icscf/cxdx_uar.c b/src/modules/ims_icscf/cxdx_uar.c
index 1ccfb80aa61..0e7bcc8e502 100644
--- a/src/modules/ims_icscf/cxdx_uar.c
+++ b/src/modules/ims_icscf/cxdx_uar.c
@@ -50,7 +50,7 @@
 #include "cxdx_avp.h"
 #include "cxdx_uar.h"
 #include "registration.h"
-#include "mod.h"
+#include "ims_icscf_mod.h"
 
 
 //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable
diff --git a/src/modules/ims_icscf/db.c b/src/modules/ims_icscf/db.c
index 764479229e8..b527d0feefe 100644
--- a/src/modules/ims_icscf/db.c
+++ b/src/modules/ims_icscf/db.c
@@ -58,7 +58,7 @@
 #include "../../lib/srdb1/db.h"
 #include "../../core/mem/shm_mem.h"
 
-#include "mod.h"
+#include "ims_icscf_mod.h"
 
 static db_func_t dbf;						/**< db function bindings*/
 extern char * ims_icscf_db_url;					/**< DB URL */
diff --git a/src/modules/ims_icscf/mod.c b/src/modules/ims_icscf/ims_icscf_mod.c
similarity index 99%
rename from src/modules/ims_icscf/mod.c
rename to src/modules/ims_icscf/ims_icscf_mod.c
index 33edfdd587a..07eb29ce5c9 100644
--- a/src/modules/ims_icscf/mod.c
+++ b/src/modules/ims_icscf/ims_icscf_mod.c
@@ -46,7 +46,7 @@
 #include "../../core/timer.h"
 #include "../../modules/sl/sl.h"
 
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include "scscf_list.h"
 #include "cxdx_uar.h"
 #include "cxdx_lir.h"
diff --git a/src/modules/ims_icscf/mod.h b/src/modules/ims_icscf/ims_icscf_mod.h
similarity index 100%
rename from src/modules/ims_icscf/mod.h
rename to src/modules/ims_icscf/ims_icscf_mod.h
diff --git a/src/modules/ims_icscf/location.h b/src/modules/ims_icscf/location.h
index 7eb63128288..929f75edd7c 100644
--- a/src/modules/ims_icscf/location.h
+++ b/src/modules/ims_icscf/location.h
@@ -49,7 +49,7 @@
 
 #include "scscf_list.h"
 #include <stdio.h>
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include "sip_messages.h"
 #include "../../lib/ims/ims_getters.h"
 
diff --git a/src/modules/ims_icscf/nds.c b/src/modules/ims_icscf/nds.c
index 2b65a650b0a..2b412d16c3a 100644
--- a/src/modules/ims_icscf/nds.c
+++ b/src/modules/ims_icscf/nds.c
@@ -59,7 +59,7 @@
 #include "../../core/mem/shm_mem.h"
 #include "../../modules/sl/sl.h"
 
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include "db.h"
 
 extern sl_api_t slb;
diff --git a/src/modules/ims_icscf/registration.h b/src/modules/ims_icscf/registration.h
index 3cc0ac18442..6f30d58629f 100644
--- a/src/modules/ims_icscf/registration.h
+++ b/src/modules/ims_icscf/registration.h
@@ -48,7 +48,7 @@
 
 #include "scscf_list.h"
 #include <stdio.h>
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include "../../lib/ims/ims_getters.h"
 
 extern struct cdp_binds cdpb;
diff --git a/src/modules/ims_icscf/scscf_list.h b/src/modules/ims_icscf/scscf_list.h
index 2150b7578ee..88c05d36fa0 100644
--- a/src/modules/ims_icscf/scscf_list.h
+++ b/src/modules/ims_icscf/scscf_list.h
@@ -48,7 +48,7 @@
 
 #include "../../core/sr_module.h"
 #include "../../modules/tm/tm_load.h"
-#include "mod.h"
+#include "ims_icscf_mod.h"
 #include <limits.h>
 #include "../../core/mem/shm_mem.h"
 
diff --git a/src/modules/ims_isc/checker.h b/src/modules/ims_isc/checker.h
index 70411326291..f35636ceab3 100644
--- a/src/modules/ims_isc/checker.h
+++ b/src/modules/ims_isc/checker.h
@@ -55,7 +55,7 @@
 #include "../../core/parser/parse_content.h"
 #include "../../core/str.h"
 #include "../../core/mem/mem.h"
-#include "mod.h"
+#include "ims_isc_mod.h"
 
 extern usrloc_api_t isc_ulb;/*!< Structure containing pointers to usrloc functions*/
 
diff --git a/src/modules/ims_isc/mod.c b/src/modules/ims_isc/ims_isc_mod.c
similarity index 99%
rename from src/modules/ims_isc/mod.c
rename to src/modules/ims_isc/ims_isc_mod.c
index 005bc2ebf32..e0f7b940ee4 100644
--- a/src/modules/ims_isc/mod.c
+++ b/src/modules/ims_isc/ims_isc_mod.c
@@ -43,7 +43,7 @@
  * 
  */
 
-#include "mod.h"
+#include "ims_isc_mod.h"
 
 #include "checker.h"
 #include "mark.h"
diff --git a/src/modules/ims_isc/mod.h b/src/modules/ims_isc/ims_isc_mod.h
similarity index 100%
rename from src/modules/ims_isc/mod.h
rename to src/modules/ims_isc/ims_isc_mod.h
diff --git a/src/modules/ims_isc/isc.h b/src/modules/ims_isc/isc.h
index dcc371acc5f..8c3715e347d 100644
--- a/src/modules/ims_isc/isc.h
+++ b/src/modules/ims_isc/isc.h
@@ -49,7 +49,7 @@
 #include "../../core/parser/msg_parser.h"
 #include "../../lib/ims/ims_getters.h"
 #include "../../core/dset.h"
-#include "mod.h"
+#include "ims_isc_mod.h"
 #include "checker.h"
 #include "mark.h"
 
diff --git a/src/modules/ims_isc/mark.h b/src/modules/ims_isc/mark.h
index 4af94a18b34..b247371942c 100644
--- a/src/modules/ims_isc/mark.h
+++ b/src/modules/ims_isc/mark.h
@@ -46,7 +46,7 @@
 #ifndef _ISC_MARK_H
 #define _ISC_MARK_H
 
-#include "mod.h"
+#include "ims_isc_mod.h"
 
 #include "checker.h"
 //#include "third_party_reg.h"
diff --git a/src/modules/ims_isc/third_party_reg.h b/src/modules/ims_isc/third_party_reg.h
index 0eaf99d9efa..66d21ee5bff 100644
--- a/src/modules/ims_isc/third_party_reg.h
+++ b/src/modules/ims_isc/third_party_reg.h
@@ -46,7 +46,7 @@
 #ifndef _ISC_THIRD_PARTY_REG_H_
 #define _ISC_THIRD_PARTY_REG_H_
 
-#include "mod.h"
+#include "ims_isc_mod.h"
 
 #include "checker.h"
 #include "mark.h"
diff --git a/src/modules/ims_ocs/mod.c b/src/modules/ims_ocs/ims_ocs_mod.c
similarity index 99%
rename from src/modules/ims_ocs/mod.c
rename to src/modules/ims_ocs/ims_ocs_mod.c
index 17e4e6278d9..9b22201e665 100644
--- a/src/modules/ims_ocs/mod.c
+++ b/src/modules/ims_ocs/ims_ocs_mod.c
@@ -24,7 +24,7 @@
 #include "../cdp/cdp_load.h"
 #include "../cdp_avp/cdp_avp_mod.h"
 #include "../../core/parser/msg_parser.h"
-#include "mod.h"
+#include "ims_ocs_mod.h"
 #include "msg_faker.h"
 #include "ocs_avp_helper.h"
 
diff --git a/src/modules/ims_ocs/mod.h b/src/modules/ims_ocs/ims_ocs_mod.h
similarity index 100%
rename from src/modules/ims_ocs/mod.h
rename to src/modules/ims_ocs/ims_ocs_mod.h
diff --git a/src/modules/ims_ocs/ocs_avp_helper.c b/src/modules/ims_ocs/ocs_avp_helper.c
index 76ed0d7b27b..310bd4e28f4 100644
--- a/src/modules/ims_ocs/ocs_avp_helper.c
+++ b/src/modules/ims_ocs/ocs_avp_helper.c
@@ -23,7 +23,7 @@
 #include "../cdp/cdp_load.h"
 #include "../cdp_avp/cdp_avp_mod.h"
 #include "ocs_avp_helper.h"
-#include "mod.h"
+#include "ims_ocs_mod.h"
 
 /**
  * Returns the value of a certain AVP from a Diameter message.
diff --git a/src/modules/ims_qos/cdpeventprocessor.c b/src/modules/ims_qos/cdpeventprocessor.c
index 14edd74d0d5..8c31ef05acc 100644
--- a/src/modules/ims_qos/cdpeventprocessor.c
+++ b/src/modules/ims_qos/cdpeventprocessor.c
@@ -48,7 +48,7 @@
 #include "../ims_usrloc_pcscf/usrloc.h"
 #include "../ims_dialog/dlg_load.h"
 #include "../cdp/session.h"
-#include "mod.h"
+#include "ims_qos_mod.h"
 #include "cdpeventprocessor.h"
 #include "rx_str.h"
 #include "ims_qos_stats.h"
diff --git a/src/modules/ims_qos/mod.c b/src/modules/ims_qos/ims_qos_mod.c
similarity index 99%
rename from src/modules/ims_qos/mod.c
rename to src/modules/ims_qos/ims_qos_mod.c
index 37021e0b8e5..19fad552017 100644
--- a/src/modules/ims_qos/mod.c
+++ b/src/modules/ims_qos/ims_qos_mod.c
@@ -67,7 +67,7 @@
 #include "rx_asr.h"
 #include "rx_str.h"
 #include "rx_aar.h"
-#include "mod.h"
+#include "ims_qos_mod.h"
 #include "../../core/parser/sdp/sdp.h"
 
 #include "../../lib/ims/useful_defs.h"
diff --git a/src/modules/ims_qos/mod.h b/src/modules/ims_qos/ims_qos_mod.h
similarity index 100%
rename from src/modules/ims_qos/mod.h
rename to src/modules/ims_qos/ims_qos_mod.h
diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c
index e87195fd1c8..684f3a75c59 100644
--- a/src/modules/ims_qos/rx_aar.c
+++ b/src/modules/ims_qos/rx_aar.c
@@ -62,7 +62,7 @@
 
 #include "../../lib/ims/ims_getters.h"
 
-#include "mod.h"
+#include "ims_qos_mod.h"
 
 #include "../../lib/ims/useful_defs.h"
 #include "ims_qos_stats.h"
diff --git a/src/modules/ims_qos/rx_authdata.c b/src/modules/ims_qos/rx_authdata.c
index 0de3a381e7f..806daf163fb 100644
--- a/src/modules/ims_qos/rx_authdata.c
+++ b/src/modules/ims_qos/rx_authdata.c
@@ -66,7 +66,7 @@
 #include "rx_authdata.h"
 #include "rx_avp.h"
 #include "../../lib/ims/ims_getters.h"
-#include "mod.h"
+#include "ims_qos_mod.h"
 
 int create_new_regsessiondata(str* domain, str* aor,  str *ip, int ip_version, int recv_port, unsigned short recv_proto, str *via_host, unsigned short via_port, unsigned short via_proto, rx_authsessiondata_t** session_data) {
 
diff --git a/src/modules/ims_qos/rx_avp.c b/src/modules/ims_qos/rx_avp.c
index 2e0a8511101..605dbbc565e 100644
--- a/src/modules/ims_qos/rx_avp.c
+++ b/src/modules/ims_qos/rx_avp.c
@@ -54,7 +54,7 @@
 #include "../ims_usrloc_pcscf/usrloc.h"
 #include "rx_authdata.h"
 #include "rx_avp.h"
-#include "mod.h"
+#include "ims_qos_mod.h"
 #include "../../core/parser/sdp/sdp_helpr_funcs.h"
 #include <regex.h>
 
diff --git a/src/modules/ims_qos/rx_str.c b/src/modules/ims_qos/rx_str.c
index 639bf7459dc..efa9617222d 100644
--- a/src/modules/ims_qos/rx_str.c
+++ b/src/modules/ims_qos/rx_str.c
@@ -54,7 +54,7 @@
 #include "../../modules/ims_dialog/dlg_load.h"
 #include "../ims_usrloc_pcscf/usrloc.h"
 #include "rx_authdata.h"
-#include "mod.h"
+#include "ims_qos_mod.h"
 #include "rx_avp.h"
 #include "rx_str.h"
 
diff --git a/src/modules/ims_registrar_pcscf/reg_mod.c b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c
similarity index 99%
rename from src/modules/ims_registrar_pcscf/reg_mod.c
rename to src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c
index 0ff8a2aba6b..e96c013f3db 100644
--- a/src/modules/ims_registrar_pcscf/reg_mod.c
+++ b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c
@@ -64,7 +64,7 @@
 
 #include "async_reginfo.h"
 
-#include "reg_mod.h"
+#include "ims_registrar_pcscf_mod.h"
 #include "save.h"
 #include "service_routes.h"
 MODULE_VERSION
diff --git a/src/modules/ims_registrar_pcscf/reg_mod.h b/src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.h
similarity index 100%
rename from src/modules/ims_registrar_pcscf/reg_mod.h
rename to src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.h
diff --git a/src/modules/ims_registrar_pcscf/notify.c b/src/modules/ims_registrar_pcscf/notify.c
index da227275022..b285753990f 100644
--- a/src/modules/ims_registrar_pcscf/notify.c
+++ b/src/modules/ims_registrar_pcscf/notify.c
@@ -28,7 +28,7 @@
  */
 
 #include "notify.h"
-#include "reg_mod.h"
+#include "ims_registrar_pcscf_mod.h"
 #include "../../core/parser/parse_from.h"
 #include "../../core/parser/parse_content.h"
 #include "../../core/parser/parse_uri.h"
diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c
index ae8575a61d7..453b4225b5b 100644
--- a/src/modules/ims_registrar_pcscf/save.c
+++ b/src/modules/ims_registrar_pcscf/save.c
@@ -45,7 +45,7 @@
 
 #include "../../core/parser/contact/contact.h"
 #include "save.h"
-#include "reg_mod.h"
+#include "ims_registrar_pcscf_mod.h"
 #include "ul_callback.h"
 #include "subscribe.h"
 
diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c
index 165a1915381..dfb1627f198 100644
--- a/src/modules/ims_registrar_pcscf/service_routes.c
+++ b/src/modules/ims_registrar_pcscf/service_routes.c
@@ -21,7 +21,7 @@
  */
 
 #include "service_routes.h"
-#include "reg_mod.h"
+#include "ims_registrar_pcscf_mod.h"
 #include "save.h"
 #include "../../core/parser/parse_via.h"
 #include "../../core/parser/msg_parser.h"
diff --git a/src/modules/ims_registrar_scscf/api.c b/src/modules/ims_registrar_scscf/api.c
index 22f51f50f3a..84fd35d7599 100644
--- a/src/modules/ims_registrar_scscf/api.c
+++ b/src/modules/ims_registrar_scscf/api.c
@@ -28,7 +28,7 @@
 
 #include "../../core/dprint.h"
 
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "lookup.h"
 #include "save.h"
 #include "api.h"
diff --git a/src/modules/ims_registrar_scscf/common.c b/src/modules/ims_registrar_scscf/common.c
index 16b28f1d543..f3faf5dfdb4 100644
--- a/src/modules/ims_registrar_scscf/common.c
+++ b/src/modules/ims_registrar_scscf/common.c
@@ -38,7 +38,7 @@
 #include "../../core/dprint.h"
 #include "../../core/parser/parse_uri.h"
 #include "rerrno.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "common.h"
 #include "config.h"
 
diff --git a/src/modules/ims_registrar_scscf/cxdx_sar.c b/src/modules/ims_registrar_scscf/cxdx_sar.c
index a436bf9a4f2..951b9d26f54 100644
--- a/src/modules/ims_registrar_scscf/cxdx_sar.c
+++ b/src/modules/ims_registrar_scscf/cxdx_sar.c
@@ -51,7 +51,7 @@
 
 #include "reply.h"
 #include "rerrno.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "cxdx_sar.h"
 #include "save.h"
 #include "userdata_parser.h"
diff --git a/src/modules/ims_registrar_scscf/reg_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c
similarity index 99%
rename from src/modules/ims_registrar_scscf/reg_mod.c
rename to src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c
index f3971c53106..6edf23cdb6f 100644
--- a/src/modules/ims_registrar_scscf/reg_mod.c
+++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c
@@ -63,7 +63,7 @@
 #include "lookup.h"
 #include "regpv.h"
 #include "reply.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "config.h"
 #include "server_assignment.h"
 #include "usrloc_cb.h"
diff --git a/src/modules/ims_registrar_scscf/reg_mod.h b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.h
similarity index 100%
rename from src/modules/ims_registrar_scscf/reg_mod.h
rename to src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.h
diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c
index 6652bab7640..54894402083 100644
--- a/src/modules/ims_registrar_scscf/lookup.c
+++ b/src/modules/ims_registrar_scscf/lookup.c
@@ -43,7 +43,7 @@
 #include "../../lib/ims/ims_getters.h"
 #include "common.h"
 #include "regtime.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "lookup.h"
 #include "config.h"
 #include "save.h"
diff --git a/src/modules/ims_registrar_scscf/path.c b/src/modules/ims_registrar_scscf/path.c
index f936d9cbeb2..90692a8fecd 100644
--- a/src/modules/ims_registrar_scscf/path.c
+++ b/src/modules/ims_registrar_scscf/path.c
@@ -33,7 +33,7 @@
 #include "../../core/parser/parse_rr.h"
 #include "../../core/parser/parse_uri.h"
 #include "path.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 
 /*! \brief
  * Combines all Path HF bodies into one string.
diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c
index fb95bb90327..a72250b5994 100644
--- a/src/modules/ims_registrar_scscf/registrar_notify.c
+++ b/src/modules/ims_registrar_scscf/registrar_notify.c
@@ -45,7 +45,7 @@
 
 #include "registrar_notify.h"
 
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "../../lib/ims/ims_getters.h"
 #include "regtime.h"
 #include "usrloc_cb.h"
diff --git a/src/modules/ims_registrar_scscf/regpv.c b/src/modules/ims_registrar_scscf/regpv.c
index 0a8ec9de901..d6d7027053a 100644
--- a/src/modules/ims_registrar_scscf/regpv.c
+++ b/src/modules/ims_registrar_scscf/regpv.c
@@ -34,7 +34,7 @@
 #include "../../core/mem/mem.h"
 #include "../../core/mod_fix.h"
 #include "../ims_usrloc_scscf/usrloc.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "common.h"
 #include "regpv.h"
 
diff --git a/src/modules/ims_registrar_scscf/reply.c b/src/modules/ims_registrar_scscf/reply.c
index 0b99b7fc445..1619d57985a 100644
--- a/src/modules/ims_registrar_scscf/reply.c
+++ b/src/modules/ims_registrar_scscf/reply.c
@@ -42,7 +42,7 @@
 #include "../../core/data_lump_rpl.h"
 #include "../ims_usrloc_scscf/usrloc.h"
 #include "rerrno.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "regtime.h"
 #include "reply.h"
 #include "config.h"
diff --git a/src/modules/ims_registrar_scscf/save.c b/src/modules/ims_registrar_scscf/save.c
index 83d6cce33bf..4a3905f2e00 100644
--- a/src/modules/ims_registrar_scscf/save.c
+++ b/src/modules/ims_registrar_scscf/save.c
@@ -66,7 +66,7 @@
 #include "sip_msg.h"
 #include "rerrno.h"
 #include "reply.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "regtime.h"
 #include "path.h"
 #include "save.h"
diff --git a/src/modules/ims_registrar_scscf/server_assignment.c b/src/modules/ims_registrar_scscf/server_assignment.c
index ad5386429ea..4d091843cf4 100644
--- a/src/modules/ims_registrar_scscf/server_assignment.c
+++ b/src/modules/ims_registrar_scscf/server_assignment.c
@@ -44,7 +44,7 @@
  */
 
 #include "server_assignment.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "../../lib/ims/ims_getters.h"
 #include "../cdp/diameter_ims_code_avp.h"
 #include "cxdx_sar.h"
diff --git a/src/modules/ims_registrar_scscf/server_assignment.h b/src/modules/ims_registrar_scscf/server_assignment.h
index 3b642880987..04c36175683 100644
--- a/src/modules/ims_registrar_scscf/server_assignment.h
+++ b/src/modules/ims_registrar_scscf/server_assignment.h
@@ -46,7 +46,7 @@
 #ifndef SERVER_ASSIGNMENT_H
 #define	SERVER_ASSIGNMENT_H
 
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "../cdp/diameter.h"
 #include "reply.h"
 #include "cxdx_sar.h"
diff --git a/src/modules/ims_registrar_scscf/sip_msg.c b/src/modules/ims_registrar_scscf/sip_msg.c
index bcb2832f84d..031dc759cdb 100644
--- a/src/modules/ims_registrar_scscf/sip_msg.c
+++ b/src/modules/ims_registrar_scscf/sip_msg.c
@@ -33,7 +33,7 @@
 #include "../../core/parser/parse_expires.h"  
 #include "../../core/ut.h"
 #include "../../core/qvalue.h"
-#include "reg_mod.h"                     /* Module parameters */
+#include "ims_registrar_scscf_mod.h"                     /* Module parameters */
 #include "regtime.h"                     /* act_time */
 #include "rerrno.h"
 #include "sip_msg.h"
diff --git a/src/modules/ims_registrar_scscf/usrloc_cb.c b/src/modules/ims_registrar_scscf/usrloc_cb.c
index a80ec56b34d..1f3c35a8ab0 100644
--- a/src/modules/ims_registrar_scscf/usrloc_cb.c
+++ b/src/modules/ims_registrar_scscf/usrloc_cb.c
@@ -42,7 +42,7 @@
 
 
 #include "server_assignment.h"
-#include "reg_mod.h"
+#include "ims_registrar_scscf_mod.h"
 #include "registrar_notify.h"
 #include "usrloc_cb.h"
 
diff --git a/src/modules/ims_usrloc_pcscf/dlist.c b/src/modules/ims_usrloc_pcscf/dlist.c
index bd2cf171feb..71c5c0c9ac9 100644
--- a/src/modules/ims_usrloc_pcscf/dlist.c
+++ b/src/modules/ims_usrloc_pcscf/dlist.c
@@ -56,7 +56,7 @@
 #include "udomain.h"           /* new_udomain, free_udomain */
 #include "usrloc.h"
 #include "utime.h"
-#include "ul_mod.h"
+#include "ims_usrloc_pcscf_mod.h"
 #include "pcontact.h"
 
 dlist_t* root = 0;
diff --git a/src/modules/ims_usrloc_pcscf/ul_mod.c b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c
similarity index 99%
rename from src/modules/ims_usrloc_pcscf/ul_mod.c
rename to src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c
index 39c7b956317..995417995a7 100644
--- a/src/modules/ims_usrloc_pcscf/ul_mod.c
+++ b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c
@@ -42,7 +42,7 @@
  */
 
 #include <stdio.h>
-#include "ul_mod.h"
+#include "ims_usrloc_pcscf_mod.h"
 #include "../../core/sr_module.h"
 #include "../../core/dprint.h"
 #include "../../core/rpc_lookup.h"
diff --git a/src/modules/ims_usrloc_pcscf/ul_mod.h b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.h
similarity index 100%
rename from src/modules/ims_usrloc_pcscf/ul_mod.h
rename to src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.h
diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c
index d5d56fb06c4..fda79357f98 100644
--- a/src/modules/ims_usrloc_pcscf/pcontact.c
+++ b/src/modules/ims_usrloc_pcscf/pcontact.c
@@ -49,7 +49,7 @@
 #include "../../core/mem/shm_mem.h"
 #include "../../core/dprint.h"
 #include "../../core/ut.h"
-#include "ul_mod.h"
+#include "ims_usrloc_pcscf_mod.h"
 #include "usrloc.h"
 #include "utime.h"
 #include "ul_callback.h"
diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c
index 8720c32aae2..8b5c2d562ad 100644
--- a/src/modules/ims_usrloc_pcscf/udomain.c
+++ b/src/modules/ims_usrloc_pcscf/udomain.c
@@ -52,7 +52,7 @@
 #include "../../lib/srdb1/db.h"
 #include "../../core/socket_info.h"
 #include "../../core/ut.h"
-#include "ul_mod.h"            /* usrloc module parameters */
+#include "ims_usrloc_pcscf_mod.h"            /* usrloc module parameters */
 #include "usrloc.h"
 #include "utime.h"
 #include "usrloc.h"
diff --git a/src/modules/ims_usrloc_pcscf/usrloc.c b/src/modules/ims_usrloc_pcscf/usrloc.c
index 9e7d05cb8a2..a716438a73e 100644
--- a/src/modules/ims_usrloc_pcscf/usrloc.c
+++ b/src/modules/ims_usrloc_pcscf/usrloc.c
@@ -48,7 +48,7 @@
 #include "pcontact.h"
 #include "udomain.h"
 #include "../../core/sr_module.h"
-#include "ul_mod.h"
+#include "ims_usrloc_pcscf_mod.h"
 #include "../../core/parser/parse_uri.h"
 
 extern unsigned int init_flag;
diff --git a/src/modules/ims_usrloc_scscf/dlist.c b/src/modules/ims_usrloc_scscf/dlist.c
index 6997b9a5d38..f383c81c23a 100644
--- a/src/modules/ims_usrloc_scscf/dlist.c
+++ b/src/modules/ims_usrloc_scscf/dlist.c
@@ -56,7 +56,7 @@
 #include "udomain.h"           /* new_udomain, free_udomain */
 #include "usrloc.h"
 #include "utime.h"
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 
 
 /*! \brief Global list of all registered domains */
diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c
index 8c50577e533..9756424cc26 100644
--- a/src/modules/ims_usrloc_scscf/impurecord.c
+++ b/src/modules/ims_usrloc_scscf/impurecord.c
@@ -49,7 +49,7 @@
 #include "../../core/mem/shm_mem.h"
 #include "../../core/dprint.h"
 #include "../../core/ut.h"
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 #include "usrloc.h"
 #include "utime.h"
 #include "ul_callback.h"
diff --git a/src/modules/ims_usrloc_scscf/ul_mod.c b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c
similarity index 99%
rename from src/modules/ims_usrloc_scscf/ul_mod.c
rename to src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c
index 82c37a3a3ec..92416ebee09 100644
--- a/src/modules/ims_usrloc_scscf/ul_mod.c
+++ b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c
@@ -42,7 +42,7 @@
  */
 
 #include <stdio.h>
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 #include "../../core/sr_module.h"
 #include "../../core/dprint.h"
 #include "../../core/rpc_lookup.h"
diff --git a/src/modules/ims_usrloc_scscf/ul_mod.h b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.h
similarity index 100%
rename from src/modules/ims_usrloc_scscf/ul_mod.h
rename to src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.h
diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c
index 4496bd9982b..227d06d51a8 100644
--- a/src/modules/ims_usrloc_scscf/subscribe.c
+++ b/src/modules/ims_usrloc_scscf/subscribe.c
@@ -44,7 +44,7 @@
  */
 
 #include "subscribe.h"
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 #include "utime.h"
 #include "udomain.h"
 
@@ -54,7 +54,7 @@
 
 #include "../../core/hashes.h"
 
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 #include "usrloc_db.h"
 
 
diff --git a/src/modules/ims_usrloc_scscf/ucontact.c b/src/modules/ims_usrloc_scscf/ucontact.c
index 2b7e074e975..9c1cd05abf9 100644
--- a/src/modules/ims_usrloc_scscf/ucontact.c
+++ b/src/modules/ims_usrloc_scscf/ucontact.c
@@ -58,7 +58,7 @@
 #include "../../core/socket_info.h"
 #include "../../core/dprint.h"
 #include "../../lib/srdb1/db.h"
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 #include "ul_callback.h"
 #include "usrloc.h"
 #include "impurecord.h"
diff --git a/src/modules/ims_usrloc_scscf/udomain.c b/src/modules/ims_usrloc_scscf/udomain.c
index d2ca4f70d53..bd7fb40b0fb 100644
--- a/src/modules/ims_usrloc_scscf/udomain.c
+++ b/src/modules/ims_usrloc_scscf/udomain.c
@@ -60,7 +60,7 @@
 #include "../../core/socket_info.h"
 #include "../../core/ut.h"
 #include "../../core/counters.h"
-#include "ul_mod.h"            /* usrloc module parameters */
+#include "ims_usrloc_scscf_mod.h"            /* usrloc module parameters */
 #include "usrloc.h"
 #include "utime.h"
 #include "usrloc.h"
diff --git a/src/modules/ims_usrloc_scscf/usrloc.c b/src/modules/ims_usrloc_scscf/usrloc.c
index f4eb47f15ef..068d9f69f2f 100644
--- a/src/modules/ims_usrloc_scscf/usrloc.c
+++ b/src/modules/ims_usrloc_scscf/usrloc.c
@@ -50,7 +50,7 @@
 #include "udomain.h"
 #include "subscribe.h"
 #include "../../core/sr_module.h"
-#include "ul_mod.h"
+#include "ims_usrloc_scscf_mod.h"
 
 /*! nat branch flag */
 extern unsigned int nat_bflag;