diff --git a/misc/tls-ca/README b/misc/tls-ca/README
index 30f5362f37b..4592ed132d9 100644
--- a/misc/tls-ca/README
+++ b/misc/tls-ca/README
@@ -2,17 +2,17 @@ Kamailio example CA
 ===================
 
 This directory contains an already generated TLS certificate that can be
-used in your Kamailio configuration. It's a generic certificate with the 
+used in your Kamailio configuration. It's a generic certificate with the
 main purpose of serving as example and for testings.
 
 IMPORTANT: it's not a trustable certificate - the CA is also an example.
 
 All TLS configuration files may be found in "user" directory. If you want to
-generate your own certificate, you may find in the "rootCA" directory the 
+generate your own certificate, you may find in the "rootCA" directory the
 root CA to sign your request with. Use "kamctl tls userCERT" command to
-create a new certificate; the rootCA password is "openser".
+create a new certificate; the rootCA password is "kamailio".
 
-What is the purpose of these default CA and certificate? First to make an 
+What is the purpose of these default CA and certificate? First to make an
 out-of-the box TLS configuration for users not so familiar with SSL/TLS.
 Second, to give access to the same CA root to a large community in order to
 encourage testings and interconnections via TLS with minimum of troubles.
diff --git a/misc/tls-ca/request.conf b/misc/tls-ca/request.conf
index 2559380a4e8..6592cc09eb5 100644
--- a/misc/tls-ca/request.conf
+++ b/misc/tls-ca/request.conf
@@ -32,7 +32,7 @@ policy           = req_policy
 
 
 #
-# Information to be moved from 
+# Information to be moved from
 # request to the certificate
 #
 nameopt          = ca_default
diff --git a/misc/tls-ca/rootCA/certs/01.pem b/misc/tls-ca/rootCA/certs/01.pem
index 56bd1833b8d..dda53d9dfe1 100644
--- a/misc/tls-ca/rootCA/certs/01.pem
+++ b/misc/tls-ca/rootCA/certs/01.pem
@@ -3,11 +3,11 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=OpenSER, ST=SIP, C=IP/emailAddress=team@openser.org, O=openser.org
+        Issuer: CN=Kamailio, ST=SIP, C=IP/emailAddress=team@kamailio.org, O=kamailio.org
         Validity
             Not Before: Oct 28 19:16:29 2005 GMT
             Not After : Oct 28 19:16:29 2006 GMT
-        Subject: C=IP, ST=SIP, O=OpenSER project, OU=OpenSER TLS tester, CN=OpenSER/emailAddress=team@openser.org
+        Subject: C=IP, ST=SIP, O=Kamailio Project, OU=Kamailio TLS Tester, CN=Kamailio/emailAddress=team@kamailio.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (512 bit)
diff --git a/misc/tls-ca/rootCA/index.txt b/misc/tls-ca/rootCA/index.txt
index a86faaf85c1..fc530986682 100644
--- a/misc/tls-ca/rootCA/index.txt
+++ b/misc/tls-ca/rootCA/index.txt
@@ -1 +1 @@
-V	061028191629Z		01	unknown	/C=IP/ST=SIP/O=OpenSER project/OU=OpenSER TLS tester/CN=OpenSER/emailAddress=team@openser.org
+V	061028191629Z		01	unknown	/C=IP/ST=SIP/O=Kamailio project/OU=Kamailio TLS Tester/CN=Kamailio/emailAddress=team@kamailio.org
diff --git a/misc/tls-ca/user/user-cert.pem b/misc/tls-ca/user/user-cert.pem
index 56bd1833b8d..dda53d9dfe1 100644
--- a/misc/tls-ca/user/user-cert.pem
+++ b/misc/tls-ca/user/user-cert.pem
@@ -3,11 +3,11 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN=OpenSER, ST=SIP, C=IP/emailAddress=team@openser.org, O=openser.org
+        Issuer: CN=Kamailio, ST=SIP, C=IP/emailAddress=team@kamailio.org, O=kamailio.org
         Validity
             Not Before: Oct 28 19:16:29 2005 GMT
             Not After : Oct 28 19:16:29 2006 GMT
-        Subject: C=IP, ST=SIP, O=OpenSER project, OU=OpenSER TLS tester, CN=OpenSER/emailAddress=team@openser.org
+        Subject: C=IP, ST=SIP, O=Kamailio Project, OU=Kamailio TLS Tester, CN=Kamailio/emailAddress=team@kamailio.org
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (512 bit)