diff --git a/doc/example-config-files/config.js.example b/doc/example-config-files/config.js.example
index 5f98d6a27..92f71cfed 100755
--- a/doc/example-config-files/config.js.example
+++ b/doc/example-config-files/config.js.example
@@ -1,9 +1,9 @@
 var config = {
     hosts: {
-        domain: 'jitmeet.example.com',
-        muc: 'conference.jitmeet.example.com', // FIXME: use XEP-0030
-        bridge: 'jitsi-videobridge.jitmeet.example.com' // FIXME: use XEP-0030
+        domain: 'jitsi.example.com',
+        muc: 'conference.jitsi.example.com', // FIXME: use XEP-0030
+        bridge: 'jitsi-videobridge.jitsi.example.com' // FIXME: use XEP-0030
     },
     useNicks: false,
-    bosh: '//jitmeet.example.com/http-bind' // FIXME: use xep-0156 for that
+    bosh: '//jitsi.example.com/http-bind' // FIXME: use xep-0156 for that
 };
diff --git a/doc/example-config-files/jitmeet.example.com.example b/doc/example-config-files/jitsi.example.com.example
similarity index 89%
rename from doc/example-config-files/jitmeet.example.com.example
rename to doc/example-config-files/jitsi.example.com.example
index 4be51f63d..3c5f054f9 100755
--- a/doc/example-config-files/jitmeet.example.com.example
+++ b/doc/example-config-files/jitsi.example.com.example
@@ -1,9 +1,9 @@
 server {
     listen 80;
 
-    server_name jitmeet.example.com;
+    server_name jitsi.example.com;
     # set the root
-    root /srv/jitmeet.example.com;
+    root /srv/jitsi.example.com;
     index index.html;
 
     location ~ ^/([a-zA-Z0-9]+)$ {
@@ -25,4 +25,4 @@ server {
         proxy_set_header Host $host;
         tcp_nodelay on;
     }
-}
\ No newline at end of file
+}
diff --git a/doc/example-config-files/prosody.cfg.lua.example b/doc/example-config-files/prosody.cfg.lua.example
index a6ed2b83f..6aca907ff 100755
--- a/doc/example-config-files/prosody.cfg.lua.example
+++ b/doc/example-config-files/prosody.cfg.lua.example
@@ -73,7 +73,7 @@ modules_enabled = {
 		--"watchregistrations"; -- Alert admins of registrations
 		--"motd"; -- Send a message to users when they log in
 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-	-- jitmeet
+	-- jitsi
 		"smacks";
 		"carbons";
 		"mam";
@@ -167,7 +167,7 @@ log = {
 
 --VirtualHost "localhost"
 
-VirtualHost "jitmeet.example.com"
+VirtualHost "jitsi.example.com"
 	-- enabled = false -- Remove this line to enable this host
 	authentication = "anonymous"
 	-- Assign this host a certificate for TLS, otherwise it would use the one
@@ -175,8 +175,8 @@ VirtualHost "jitmeet.example.com"
 	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
 	-- use the global one.
 	ssl = {
-		key = "/var/lib/prosody/jitmeet.example.com.key";
-		certificate = "/var/lib/prosody/jitmeet.example.com.crt";
+		key = "/var/lib/prosody/jitsi.example.com.key";
+		certificate = "/var/lib/prosody/jitsi.example.com.crt";
 	}
 
 ------ Components ------
@@ -199,7 +199,7 @@ VirtualHost "jitmeet.example.com"
 --Component "gateway.example.com"
 --	component_secret = "password"
 
-Component "conference.jitmeet.example.com" "muc"
+Component "conference.jitsi.example.com" "muc"
 
-Component "jitsi-videobridge.jitmeet.example.com"
+Component "jitsi-videobridge.jitsi.example.com"
     component_secret = "IfGaish6"