diff --git a/src/Makefile.groups b/src/Makefile.groups
index e9ae36427d4..da1452a6965 100644
--- a/src/Makefile.groups
+++ b/src/Makefile.groups
@@ -20,7 +20,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \
 # - extra used modules, with no extra dependency
 mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \
 			     qos sca seas sms sst timer tmrec uac_redirect xhttp \
-				 xhttp_rpc xprint jsonrpc-s nosip dmq_usrloc statsd rtjson \
+				 xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \
 				 log_custom ss7ops
 
 # - common modules depending on database
@@ -60,7 +60,7 @@ mod_list_unixodbc=db_unixodbc
 mod_list_cassandra=db_cassandra ndb_cassandra
 
 # - modules depending on xml2 library
-mod_list_cpl=cpl-c
+mod_list_cpl=cplc
 
 # - modules depending on xml2 library
 mod_list_xmldeps=xhttp_pi xmlrpc xmlops
@@ -138,10 +138,10 @@ mod_list_sqlite=db_sqlite
 mod_list_oracle=db_oracle
 
 # - modules depending on json (+libevent) library
-mod_list_json=json jsonrpc-c
+mod_list_json=json jsonrpcc
 
 # - modules depending on jansson (+libevent) library
-mod_list_jansson=jansson janssonrpc-c
+mod_list_jansson=jansson janssonrpcc
 
 # - modules depending on redis library
 mod_list_redis=ndb_redis
diff --git a/src/modules/janssonrpc-c/Makefile b/src/modules/janssonrpcc/Makefile
similarity index 95%
rename from src/modules/janssonrpc-c/Makefile
rename to src/modules/janssonrpcc/Makefile
index 21e4d4c08c9..596b3d42f50 100644
--- a/src/modules/janssonrpc-c/Makefile
+++ b/src/modules/janssonrpcc/Makefile
@@ -1,12 +1,12 @@
 #
 # janssonrpc-c module makefile
 #
-# 
+#
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
 auto_gen=
-NAME=janssonrpc-c.so
+NAME=janssonrpcc.so
 LIBS=-lm
 
 BUILDER = $(shell which pkg-config)
@@ -19,7 +19,7 @@ else
 	DEFS+= $(shell pkg-config --cflags libevent)
 	LIBS+= $(shell pkg-config --libs libevent)
 endif
- 
+
 DEFS+=-DOPENSER_MOD_INTERFACE
 
 SERLIBPATH=../../lib
diff --git a/src/modules/janssonrpc-c/README b/src/modules/janssonrpcc/README
similarity index 100%
rename from src/modules/janssonrpc-c/README
rename to src/modules/janssonrpcc/README
diff --git a/src/modules/janssonrpc-c/doc/Makefile b/src/modules/janssonrpcc/doc/Makefile
similarity index 76%
rename from src/modules/janssonrpc-c/doc/Makefile
rename to src/modules/janssonrpcc/doc/Makefile
index 8eb5e083802..a49914aaaa0 100644
--- a/src/modules/janssonrpc-c/doc/Makefile
+++ b/src/modules/janssonrpcc/doc/Makefile
@@ -1,4 +1,4 @@
-docs = janssonrpc-c.xml
+docs = janssonrpcc.xml
 
 docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module
diff --git a/src/modules/janssonrpc-c/doc/janssonrpc-c.xml b/src/modules/janssonrpcc/doc/janssonrpcc.xml
similarity index 83%
rename from src/modules/janssonrpc-c/doc/janssonrpc-c.xml
rename to src/modules/janssonrpcc/doc/janssonrpcc.xml
index bc68d96965d..3bdbb426dd4 100644
--- a/src/modules/janssonrpc-c/doc/janssonrpc-c.xml
+++ b/src/modules/janssonrpcc/doc/janssonrpcc.xml
@@ -10,8 +10,8 @@
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
 	<bookinfo>
-	<title>janssonrpc-c Module</title>
-	<productname class="trade">sip-router.org</productname>
+	<title>JANSSONRPCC (jsonrpc client) Module</title>
+	<productname class="trade">kamailio.org</productname>
 	<authorgroup>
 		<author>
 			<firstname>Joe</firstname>
@@ -31,6 +31,6 @@
 	</bookinfo>
 	<toc></toc>
 
-	<xi:include href="janssonrpc-c_admin.xml"/>
+	<xi:include href="janssonrpcc_admin.xml"/>
 
 </book>
diff --git a/src/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml b/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml
similarity index 96%
rename from src/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml
rename to src/modules/janssonrpcc/doc/janssonrpcc_admin.xml
index ef6d5cb370e..2b67caff65b 100644
--- a/src/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml
+++ b/src/modules/janssonrpcc/doc/janssonrpcc_admin.xml
@@ -82,7 +82,7 @@
 			<title>Set <varname>min_srv_ttl</varname> parameter</title>
 			<programlisting format="linespecific">
 ...
-modparam("janssonrpc-c", "min_srv_ttl", 30)
+modparam("janssonrpcc", "min_srv_ttl", 30)
 ...
 			</programlisting>
 			<para>
@@ -104,7 +104,7 @@ modparam("janssonrpc-c", "min_srv_ttl", 30)
 			<title>Set <varname>result_pv</varname> parameter</title>
 			<programlisting format="linespecific">
 ...
-modparam("janssonrpc-c", "result_pv", "$var(result)")
+modparam("janssonrpcc", "result_pv", "$var(result)")
 ...
 			</programlisting>
 		</example>
@@ -140,10 +140,10 @@ modparam("janssonrpc-c", "result_pv", "$var(result)")
 				<title>Set <varname>server</varname> parameter</title>
 				<programlisting format="linespecific">
 ...
-modparam("janssonrpc-c", "server", "conn=tests;srv=_test1._tcp.example.net");
-modparam("janssonrpc-c", "server", "conn=tests;srv=_test2._tcp.example.net");
-modparam("janssonrpc-c", "server", "conn=local;addr=localhost;port=8080;priority=10;weight=10");
-modparam("janssonrpc-c", "server", "conn=user_db;addr=rpc.prod.exmaple.net;port=5060;priority=10;weight=10");
+modparam("janssonrpcc", "server", "conn=tests;srv=_test1._tcp.example.net");
+modparam("janssonrpcc", "server", "conn=tests;srv=_test2._tcp.example.net");
+modparam("janssonrpcc", "server", "conn=local;addr=localhost;port=8080;priority=10;weight=10");
+modparam("janssonrpcc", "server", "conn=user_db;addr=rpc.prod.exmaple.net;port=5060;priority=10;weight=10");
 ...
 				</programlisting>
 			</example>
diff --git a/src/modules/janssonrpc-c/janssonrpc.h b/src/modules/janssonrpcc/janssonrpc.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc.h
rename to src/modules/janssonrpcc/janssonrpc.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_connect.c
rename to src/modules/janssonrpcc/janssonrpc_connect.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_connect.h b/src/modules/janssonrpcc/janssonrpc_connect.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_connect.h
rename to src/modules/janssonrpcc/janssonrpc_connect.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_funcs.c
rename to src/modules/janssonrpcc/janssonrpc_funcs.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_funcs.h b/src/modules/janssonrpcc/janssonrpc_funcs.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_funcs.h
rename to src/modules/janssonrpcc/janssonrpc_funcs.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_global.c b/src/modules/janssonrpcc/janssonrpc_global.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_global.c
rename to src/modules/janssonrpcc/janssonrpc_global.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_io.c
rename to src/modules/janssonrpcc/janssonrpc_io.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_io.h b/src/modules/janssonrpcc/janssonrpc_io.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_io.h
rename to src/modules/janssonrpcc/janssonrpc_io.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_request.c
rename to src/modules/janssonrpcc/janssonrpc_request.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_request.h b/src/modules/janssonrpcc/janssonrpc_request.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_request.h
rename to src/modules/janssonrpcc/janssonrpc_request.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_server.c
rename to src/modules/janssonrpcc/janssonrpc_server.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_server.h b/src/modules/janssonrpcc/janssonrpc_server.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_server.h
rename to src/modules/janssonrpcc/janssonrpc_server.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_srv.c
rename to src/modules/janssonrpcc/janssonrpc_srv.c
diff --git a/src/modules/janssonrpc-c/janssonrpc_srv.h b/src/modules/janssonrpcc/janssonrpc_srv.h
similarity index 100%
rename from src/modules/janssonrpc-c/janssonrpc_srv.h
rename to src/modules/janssonrpcc/janssonrpc_srv.h
diff --git a/src/modules/janssonrpc-c/janssonrpc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c
similarity index 99%
rename from src/modules/janssonrpc-c/janssonrpc_mod.c
rename to src/modules/janssonrpcc/janssonrpcc_mod.c
index cd2dc28ac2e..a6e9c010d30 100644
--- a/src/modules/janssonrpc-c/janssonrpc_mod.c
+++ b/src/modules/janssonrpcc/janssonrpcc_mod.c
@@ -98,7 +98,7 @@ static param_export_t mod_params[]={
  * Exports
  */
 struct module_exports exports = {
-		"janssonrpc-c",       /* module name */
+		"janssonrpcc",       /* module name */
 		DEFAULT_DLFLAGS, /* dlopen flags */
 		cmds,            /* Exported functions */
 		mod_params,      /* Exported parameters */
diff --git a/src/modules/janssonrpc-c/netstring.c b/src/modules/janssonrpcc/netstring.c
similarity index 100%
rename from src/modules/janssonrpc-c/netstring.c
rename to src/modules/janssonrpcc/netstring.c
diff --git a/src/modules/janssonrpc-c/netstring.h b/src/modules/janssonrpcc/netstring.h
similarity index 100%
rename from src/modules/janssonrpc-c/netstring.h
rename to src/modules/janssonrpcc/netstring.h
diff --git a/src/modules/janssonrpc-c/test/mem-test.sh b/src/modules/janssonrpcc/test/mem-test.sh
similarity index 100%
rename from src/modules/janssonrpc-c/test/mem-test.sh
rename to src/modules/janssonrpcc/test/mem-test.sh
diff --git a/src/modules/janssonrpc-c/test/run-tests.sh b/src/modules/janssonrpcc/test/run-tests.sh
similarity index 100%
rename from src/modules/janssonrpc-c/test/run-tests.sh
rename to src/modules/janssonrpcc/test/run-tests.sh
diff --git a/src/modules/janssonrpc-c/test/test.cfg b/src/modules/janssonrpcc/test/test.cfg
similarity index 100%
rename from src/modules/janssonrpc-c/test/test.cfg
rename to src/modules/janssonrpcc/test/test.cfg
diff --git a/src/modules/janssonrpc-c/unit_tests/Makefile b/src/modules/janssonrpcc/unit_tests/Makefile
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/Makefile
rename to src/modules/janssonrpcc/unit_tests/Makefile
diff --git a/src/modules/janssonrpc-c/unit_tests/netstring.c b/src/modules/janssonrpcc/unit_tests/netstring.c
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/netstring.c
rename to src/modules/janssonrpcc/unit_tests/netstring.c
diff --git a/src/modules/janssonrpc-c/unit_tests/seatest/license.txt b/src/modules/janssonrpcc/unit_tests/seatest/license.txt
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/seatest/license.txt
rename to src/modules/janssonrpcc/unit_tests/seatest/license.txt
diff --git a/src/modules/janssonrpc-c/unit_tests/seatest/seatest.c b/src/modules/janssonrpcc/unit_tests/seatest/seatest.c
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/seatest/seatest.c
rename to src/modules/janssonrpcc/unit_tests/seatest/seatest.c
diff --git a/src/modules/janssonrpc-c/unit_tests/seatest/seatest.h b/src/modules/janssonrpcc/unit_tests/seatest/seatest.h
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/seatest/seatest.h
rename to src/modules/janssonrpcc/unit_tests/seatest/seatest.h
diff --git a/src/modules/janssonrpc-c/unit_tests/test.h b/src/modules/janssonrpcc/unit_tests/test.h
similarity index 100%
rename from src/modules/janssonrpc-c/unit_tests/test.h
rename to src/modules/janssonrpcc/unit_tests/test.h
diff --git a/src/modules/jsonrpc-c/.gitignore b/src/modules/jsonrpcc/.gitignore
similarity index 100%
rename from src/modules/jsonrpc-c/.gitignore
rename to src/modules/jsonrpcc/.gitignore
diff --git a/src/modules/jsonrpc-c/Makefile b/src/modules/jsonrpcc/Makefile
similarity index 92%
rename from src/modules/jsonrpc-c/Makefile
rename to src/modules/jsonrpcc/Makefile
index 171eb272deb..8e88828df43 100644
--- a/src/modules/jsonrpc-c/Makefile
+++ b/src/modules/jsonrpcc/Makefile
@@ -1,12 +1,12 @@
 #
-# jsonrpc module makefile
+# jsonrpcc module makefile
+#
 #
-# 
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
 auto_gen=
-NAME=jsonrpc-c.so
+NAME=jsonrpcc.so
 LIBS=-lm
 JLIB=json
 
@@ -31,8 +31,7 @@ else
 	DEFS+= $(shell pkg-config --cflags libevent)
 	LIBS+= $(shell pkg-config --libs libevent)
 endif
- 
+
 DEFS+=-DKAMAILIO_MOD_INTERFACE
 
-SERLIBPATH=../../lib
 include ../../Makefile.modules
diff --git a/src/modules/jsonrpc-c/README b/src/modules/jsonrpcc/README
similarity index 100%
rename from src/modules/jsonrpc-c/README
rename to src/modules/jsonrpcc/README
diff --git a/src/modules/jsonrpc-c/TODO b/src/modules/jsonrpcc/TODO
similarity index 100%
rename from src/modules/jsonrpc-c/TODO
rename to src/modules/jsonrpcc/TODO
diff --git a/src/modules/jsonrpc-s/doc/Makefile b/src/modules/jsonrpcc/doc/Makefile
similarity index 78%
rename from src/modules/jsonrpc-s/doc/Makefile
rename to src/modules/jsonrpcc/doc/Makefile
index 1f69db38aea..b21ab3f2872 100644
--- a/src/modules/jsonrpc-s/doc/Makefile
+++ b/src/modules/jsonrpcc/doc/Makefile
@@ -1,4 +1,4 @@
-docs = jsonrpc-s.xml
+docs = jsonrpcc.xml
 
 docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module
diff --git a/src/modules/jsonrpc-c/doc/jsonrpc-c.xml b/src/modules/jsonrpcc/doc/jsonrpcc.xml
similarity index 89%
rename from src/modules/jsonrpc-c/doc/jsonrpc-c.xml
rename to src/modules/jsonrpcc/doc/jsonrpcc.xml
index c8daf76a07e..780db4274ec 100644
--- a/src/modules/jsonrpc-c/doc/jsonrpc-c.xml
+++ b/src/modules/jsonrpcc/doc/jsonrpcc.xml
@@ -10,7 +10,7 @@
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
-	<title>jsonrpc-c (client) Module</title>
+	<title>JSONRPCC (jsonrpc client) Module</title>
 	<productname class="trade">sip-router.org</productname>
 	<authorgroup>
 	    <author>
@@ -30,8 +30,7 @@
 	</copyright>
     </bookinfo>
     <toc></toc>
-    
-    <xi:include href="jsonrpc-c_admin.xml"/>
-    
-    
+
+    <xi:include href="jsonrpcc_admin.xml"/>
+
 </book>
diff --git a/src/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/src/modules/jsonrpcc/doc/jsonrpcc_admin.xml
similarity index 97%
rename from src/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
rename to src/modules/jsonrpcc/doc/jsonrpcc_admin.xml
index 6eb243d5cd3..e55461d35fc 100644
--- a/src/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml
+++ b/src/modules/jsonrpcc/doc/jsonrpcc_admin.xml
@@ -86,7 +86,7 @@
 				<title>Set <varname>servers</varname> parameter</title>
 				<programlisting format="linespecific">
 ...
-modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server:9999,1")
+modparam("jsonrpcc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server:9999,1")
 ...
 				</programlisting>
 			</example>
@@ -101,7 +101,7 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server:
 				<title>Set <varname>max_conn_attempts</varname> parameter</title>
 				<programlisting format="linespecific">
 ...
-modparam("jsonrpc", "max_conn_attempts", 10)
+modparam("jsonrpcc", "max_conn_attempts", 10)
 ...
 				</programlisting>
 			</example>
diff --git a/src/modules/jsonrpc-c/jsonrpc.c b/src/modules/jsonrpcc/jsonrpc.c
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc.c
rename to src/modules/jsonrpcc/jsonrpc.c
diff --git a/src/modules/jsonrpc-c/jsonrpc.h b/src/modules/jsonrpcc/jsonrpc.h
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc.h
rename to src/modules/jsonrpcc/jsonrpc.h
diff --git a/src/modules/jsonrpc-c/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc_io.c
rename to src/modules/jsonrpcc/jsonrpc_io.c
diff --git a/src/modules/jsonrpc-c/jsonrpc_io.h b/src/modules/jsonrpcc/jsonrpc_io.h
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc_io.h
rename to src/modules/jsonrpcc/jsonrpc_io.h
diff --git a/src/modules/jsonrpc-c/jsonrpc_request.c b/src/modules/jsonrpcc/jsonrpc_request.c
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc_request.c
rename to src/modules/jsonrpcc/jsonrpc_request.c
diff --git a/src/modules/jsonrpc-c/jsonrpc_request.h b/src/modules/jsonrpcc/jsonrpc_request.h
similarity index 100%
rename from src/modules/jsonrpc-c/jsonrpc_request.h
rename to src/modules/jsonrpcc/jsonrpc_request.h
diff --git a/src/modules/jsonrpc-c/jsonrpc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c
similarity index 99%
rename from src/modules/jsonrpc-c/jsonrpc_mod.c
rename to src/modules/jsonrpcc/jsonrpcc_mod.c
index f72dbe04a13..567fdaf1428 100644
--- a/src/modules/jsonrpc-c/jsonrpc_mod.c
+++ b/src/modules/jsonrpcc/jsonrpcc_mod.c
@@ -76,7 +76,7 @@ static param_export_t mod_params[]={
  * Exports
  */
 struct module_exports exports = {
-		"jsonrpc",           /* module name */
+		"jsonrpcc",           /* module name */
 		DEFAULT_DLFLAGS,     /* dlopen flags */
 		cmds,                /* Exported functions */
 		mod_params,          /* Exported parameters */
diff --git a/src/modules/jsonrpc-c/netstring.c b/src/modules/jsonrpcc/netstring.c
similarity index 100%
rename from src/modules/jsonrpc-c/netstring.c
rename to src/modules/jsonrpcc/netstring.c
diff --git a/src/modules/jsonrpc-c/netstring.h b/src/modules/jsonrpcc/netstring.h
similarity index 100%
rename from src/modules/jsonrpc-c/netstring.h
rename to src/modules/jsonrpcc/netstring.h
diff --git a/src/modules/jsonrpc-s/Makefile b/src/modules/jsonrpcs/Makefile
similarity index 91%
rename from src/modules/jsonrpc-s/Makefile
rename to src/modules/jsonrpcs/Makefile
index 3ef462a1202..63a5a0920ed 100644
--- a/src/modules/jsonrpc-s/Makefile
+++ b/src/modules/jsonrpcs/Makefile
@@ -1,10 +1,10 @@
-# 
-# 
+#
+#
 # WARNING: do not run this directly, it should be run by the master Makefile
 
 include ../../Makefile.defs
 auto_gen=
-NAME=jsonrpc-s.so
+NAME=jsonrpcs.so
 DEFS +=
 LIBS +=
 
diff --git a/src/modules/jsonrpc-s/README b/src/modules/jsonrpcs/README
similarity index 100%
rename from src/modules/jsonrpc-s/README
rename to src/modules/jsonrpcs/README
diff --git a/src/modules/jsonrpc-c/doc/Makefile b/src/modules/jsonrpcs/doc/Makefile
similarity index 78%
rename from src/modules/jsonrpc-c/doc/Makefile
rename to src/modules/jsonrpcs/doc/Makefile
index cb72095ae3e..46de690734b 100644
--- a/src/modules/jsonrpc-c/doc/Makefile
+++ b/src/modules/jsonrpcs/doc/Makefile
@@ -1,4 +1,4 @@
-docs = jsonrpc-c.xml
+docs = jsonrpcs.xml
 
 docbook_dir = ../../../../doc/docbook
 include $(docbook_dir)/Makefile.module
diff --git a/src/modules/jsonrpc-s/doc/jsonrpc-s.xml b/src/modules/jsonrpcs/doc/jsonrpcs.xml
similarity index 89%
rename from src/modules/jsonrpc-s/doc/jsonrpc-s.xml
rename to src/modules/jsonrpcs/doc/jsonrpcs.xml
index b3c73a8f9dc..5d6243a4454 100644
--- a/src/modules/jsonrpc-s/doc/jsonrpc-s.xml
+++ b/src/modules/jsonrpcs/doc/jsonrpcs.xml
@@ -10,7 +10,7 @@
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
     <bookinfo>
-	<title>JSONRPC-S Module</title>
+	<title>JSONRPC-S (jsonrpc server) Module</title>
 	<productname class="trade">kamailio.org</productname>
 	<authorgroup>
 	    <author>
@@ -30,8 +30,7 @@
 	</copyright>
     </bookinfo>
     <toc></toc>
-    
-    <xi:include href="jsonrpc-s_admin.xml"/>
-    
-    
+
+    <xi:include href="jsonrpcs_admin.xml"/>
+
 </book>
diff --git a/src/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml
similarity index 90%
rename from src/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml
rename to src/modules/jsonrpcs/doc/jsonrpcs_admin.xml
index 3aee78f981d..98a3ccce5a4 100644
--- a/src/modules/jsonrpc-s/doc/jsonrpc-s_admin.xml
+++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml
@@ -82,7 +82,7 @@
 	</section>
 	<section>
 	<title>Parameters</title>
-	<section id="jsonrpc-s.p.pretty_format">
+	<section id="jsonrpcs.p.pretty_format">
 		<title><varname>pretty_format</varname> (int)</title>
 		<para>
 			Pretty format for JSON-RPC response document.
@@ -96,12 +96,12 @@
 		<title>Set <varname>pretty_format</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "pretty_format", 1)
+modparam("jsonrpcs", "pretty_format", 1)
 ...
 </programlisting>
 		</example>
 	</section>
-	<section id="jsonrpc-s.p.transport">
+	<section id="jsonrpcs.p.transport">
 		<title><varname>transport</varname> (int)</title>
 		<para>
 			Control what transports are enabled. The value can be:
@@ -139,12 +139,12 @@ modparam("jsonrpc-s", "pretty_format", 1)
 		<title>Set <varname>transport</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "transport", 1)
+modparam("jsonrpcs", "transport", 1)
 ...
 </programlisting>
 		</example>
 	</section>
-	<section id="jsonrpc-s.p.fifo_name">
+	<section id="jsonrpcs.p.fifo_name">
 		<title><varname>fifo_name</varname> (str)</title>
 		<para>
 		The name of the FIFO file to be created for listening and
@@ -160,13 +160,13 @@ modparam("jsonrpc-s", "transport", 1)
 		<title>Set <varname>fifo_name</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "fifo_name", "/tmp/kamailio_jsonrpc_fifo")
+modparam("jsonrpcs", "fifo_name", "/tmp/kamailio_jsonrpc_fifo")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.fifo_mode">
+	<section id="jsonrpcs.p.fifo_mode">
 		<title><varname>fifo_mode</varname> (int)</title>
 		<para>
 		Permission to be used for creating the listening FIFO file. It
@@ -181,13 +181,13 @@ modparam("jsonrpc-s", "fifo_name", "/tmp/kamailio_jsonrpc_fifo")
 		<title>Set <varname>fifo_mode</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "fifo_mode", 0600)
+modparam("jsonrpcs", "fifo_mode", 0600)
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.fifo_group">
+	<section id="jsonrpcs.p.fifo_group">
 		<title><varname>fifo_group</varname> (int or str)</title>
 		<para>
 		System Group to be used for creating the listening FIFO file.
@@ -201,14 +201,14 @@ modparam("jsonrpc-s", "fifo_mode", 0600)
 		<title>Set <varname>fifo_group</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "fifo_group", 0)
-modparam("jsonrpc-s", "fifo_group", "root")
+modparam("jsonrpcs", "fifo_group", 0)
+modparam("jsonrpcs", "fifo_group", "root")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.fifo_user">
+	<section id="jsonrpcs.p.fifo_user">
 		<title><varname>fifo_user</varname> (int or str)</title>
 		<para>
 		System User to be used for creating the listening FIFO file.
@@ -222,14 +222,14 @@ modparam("jsonrpc-s", "fifo_group", "root")
 		<title>Set <varname>fifo_user</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "fifo_user", 0)
-modparam("jsonrpc-s", "fifo_user", "root")
+modparam("jsonrpcs", "fifo_user", 0)
+modparam("jsonrpcs", "fifo_user", "root")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.fifo_reply_dir">
+	<section id="jsonrpcs.p.fifo_reply_dir">
 		<title><varname>fifo_reply_dir</varname> (str)</title>
 		<para>
 		Directory to be used for creating the reply FIFO files.
@@ -243,13 +243,13 @@ modparam("jsonrpc-s", "fifo_user", "root")
 		<title>Set <varname>fifo_reply_dir</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "fifo_reply_dir", "/home/kamailio/tmp/")
+modparam("jsonrpcs", "fifo_reply_dir", "/home/kamailio/tmp/")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_socket">
+	<section id="jsonrpcs.p.dgram_socket">
 		<title><varname>dgram_socket</varname> (str)</title>
 		<para>
 		The name of a UNIX SOCKET or an IP address.
@@ -266,15 +266,15 @@ modparam("jsonrpc-s", "fifo_reply_dir", "/home/kamailio/tmp/")
 		<title>Set <varname>dgram_socket</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_socket", "/tmp/kamailio_rpc.sock")
+modparam("jsonrpcs", "dgram_socket", "/tmp/kamailio_rpc.sock")
 ...
-modparam("jsonrpc-s", "dgram_socket", "udp:1.2.3.4:8090")
+modparam("jsonrpcs", "dgram_socket", "udp:1.2.3.4:8090")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_workers">
+	<section id="jsonrpcs.p.dgram_workers">
 		<title><varname>dgram_workers</varname> (str)</title>
 		<para>
 		The number of worker processes to be created. Each worker process
@@ -289,13 +289,13 @@ modparam("jsonrpc-s", "dgram_socket", "udp:1.2.3.4:8090")
 		<title>Set <varname>dgram_workers</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_workers", 4)
+modparam("jsonrpcs", "dgram_workers", 4)
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_mode">
+	<section id="jsonrpcs.p.dgram_mode">
 		<title><varname>dgram_mode</varname> (int)</title>
 		<para>
 		Permission to be used for creating the listening UNIX datagram socket.
@@ -311,13 +311,13 @@ modparam("jsonrpc-s", "dgram_workers", 4)
 		<title>Set <varname>dgram_mode</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_mode", 0600)
+modparam("jsonrpcs", "dgram_mode", 0600)
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_group">
+	<section id="jsonrpcs.p.dgram_group">
 		<title><varname>dgram_group</varname> (int)
 		<varname>dgram_group</varname> (str)</title>
 		<para>
@@ -332,14 +332,14 @@ modparam("jsonrpc-s", "dgram_mode", 0600)
 		<title>Set <varname>dgram_group</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_group", 0)
-modparam("jsonrpc-s", "dgram_group", "root")
+modparam("jsonrpcs", "dgram_group", 0)
+modparam("jsonrpcs", "dgram_group", "root")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_user">
+	<section id="jsonrpcs.p.dgram_user">
 		<title><varname>dgram_user</varname> (int)
 		<varname>dgram_group</varname> (str)</title>
 		<para>
@@ -354,14 +354,14 @@ modparam("jsonrpc-s", "dgram_group", "root")
 		<title>Set <varname>dgram_user</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_user", 0)
-modparam("jsonrpc-s", "dgram_user", "root")
+modparam("jsonrpcs", "dgram_user", 0)
+modparam("jsonrpcs", "dgram_user", "root")
 ...
 </programlisting>
 		</example>
 	</section>
 
-	<section id="jsonrpc-s.p.dgram_timeout">
+	<section id="jsonrpcs.p.dgram_timeout">
 		<title><varname>dgram_timeout</varname> (int)</title>
 		<para>
 		The reply will expire after trying to sent it for socket_timeout
@@ -376,7 +376,7 @@ modparam("jsonrpc-s", "dgram_user", "root")
 		<title>Set <varname>dgram_timeout</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("jsonrpc-s", "dgram_timeout", 2000)
+modparam("jsonrpcs", "dgram_timeout", 2000)
 ...
 </programlisting>
 		</example>
@@ -386,7 +386,7 @@ modparam("jsonrpc-s", "dgram_timeout", 2000)
 
 	<section>
 	<title>Functions</title>
- 	<section id="jsonrpc-s.f.jsonrpc_dispatch">
+ 	<section id="jsonrpcs.f.jsonrpc_dispatch">
 	    <title>
 		<function moreinfo="none">jsonrpc_dispatch()</function>
 	    </title>
@@ -415,7 +415,7 @@ mpath="modules/"
 loadmodule "sl.so"
 loadmodule "pv.so"
 loadmodule "xhttp.so"
-loadmodule "jsonrpc-s.so"
+loadmodule "jsonrpcs.so"
 
 request_route {
 	send_reply("404", "not found");
@@ -440,7 +440,7 @@ event_route[xhttp:request] {
 </programlisting>
 	    </example>
 	</section>
- 	<section id="jsonrpc-s.f.jsonrpc_exec">
+ 	<section id="jsonrpcs.f.jsonrpc_exec">
 	    <title>
 		<function moreinfo="none">jsonrpc_exec(cmd)</function>
 	    </title>
diff --git a/src/modules/jsonrpc-s/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c
similarity index 99%
rename from src/modules/jsonrpc-s/jsonrpcs_fifo.c
rename to src/modules/jsonrpcs/jsonrpcs_fifo.c
index 2e56913f2c2..8a810642f58 100644
--- a/src/modules/jsonrpc-s/jsonrpcs_fifo.c
+++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c
@@ -35,7 +35,7 @@
 #include "../../core/sr_module.h"
 #include "../../core/cfg/cfg_struct.h"
 
-#include "jsonrpc-s_mod.h"
+#include "jsonrpcs_mod.h"
 
 /* FIFO server parameters */
 char *jsonrpc_fifo = NULL;				/*!< FIFO file name */
diff --git a/src/modules/jsonrpc-s/jsonrpc-s_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c
similarity index 99%
rename from src/modules/jsonrpc-s/jsonrpc-s_mod.c
rename to src/modules/jsonrpcs/jsonrpcs_mod.c
index 7e112eebb06..f0205fce29c 100644
--- a/src/modules/jsonrpc-s/jsonrpc-s_mod.c
+++ b/src/modules/jsonrpcs/jsonrpcs_mod.c
@@ -44,7 +44,7 @@
 #include "../../core/ip_addr.h"
 #include "../../modules/xhttp/api.h"
 
-#include "jsonrpc-s_mod.h"
+#include "jsonrpcs_mod.h"
 
 /** @addtogroup jsonrpc-s
  * @ingroup modules
@@ -171,7 +171,7 @@ static pv_export_t mod_pvs[] = {
 
 /** module exports */
 struct module_exports exports= {
-	"jsonrpc-s",
+	"jsonrpcs",
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	cmds,
 	params,
diff --git a/src/modules/jsonrpc-s/jsonrpc-s_mod.h b/src/modules/jsonrpcs/jsonrpcs_mod.h
similarity index 100%
rename from src/modules/jsonrpc-s/jsonrpc-s_mod.h
rename to src/modules/jsonrpcs/jsonrpcs_mod.h
diff --git a/src/modules/jsonrpc-s/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c
similarity index 99%
rename from src/modules/jsonrpc-s/jsonrpcs_sock.c
rename to src/modules/jsonrpcs/jsonrpcs_sock.c
index e47806f672f..0042411f537 100644
--- a/src/modules/jsonrpc-s/jsonrpcs_sock.c
+++ b/src/modules/jsonrpcs/jsonrpcs_sock.c
@@ -40,7 +40,7 @@
 #include "../../core/resolve.h"
 #include "../../core/ip_addr.h"
 
-#include "jsonrpc-s_mod.h"
+#include "jsonrpcs_mod.h"
 
 /* DATAGRAM TRANSPORT */