diff --git a/.gitignore b/.gitignore
index c080079..16197df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 #
-# Xensit Xnode Ignore list
+# Xnode Ignore list
 #
 
 # Ignore all build folders
diff --git a/README.md b/README.md
index d024198..4132904 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,5 @@
 # xnode
 
+This projects contains all packages to build the 
+software for all the different node types of the sensor network.
+
diff --git a/lib-build/debug-server/server-config.js b/lib-build/debug-server/server-config.js
index 3684680..c6c4ae2 100644
--- a/lib-build/debug-server/server-config.js
+++ b/lib-build/debug-server/server-config.js
@@ -41,13 +41,13 @@ module.exports = {
   server: {
     httpPort: process.env.HTTP_PORT || 8008,
     httpTrustProxy: true,
-    sessionSecret: 'xensitXDS',
+    sessionSecret: 'debugSecret',
     sessionTTL: 14 * 24 * 60 * 60, // = 14 days. Default
   },
   application: {
-    name: 'Xensit Debug Server',
+    name: 'Xnode Debug Server',
     index: {
-      pageTitle: 'Xensit Debug Server',
+      pageTitle: 'Xnode Debug Server',
       pageKeywords: 'xnode,sensor,data,weather,wireless',
     },
   },
@@ -63,7 +63,7 @@ module.exports = {
     },
     rss: {
       link: 'http://localhost:8008',
-      author: 'Xensit',
+      author: 'Xnode',
       options: {
       }
     }
diff --git a/lib-build/debug-server/www_static/css/style.css b/lib-build/debug-server/www_static/css/style.css
index d610696..3f6132c 100644
--- a/lib-build/debug-server/www_static/css/style.css
+++ b/lib-build/debug-server/www_static/css/style.css
@@ -46,7 +46,7 @@
 	position: absolute;
 	top: 47px;
 	right: 0px;
-	background: url("../img/xensit-sm.png") 50% 0px no-repeat transparent !important;
+	background: url("../img/logo.png") 50% 0px no-repeat transparent !important;
 	height: 77px;
 	width: 212px;
 }
diff --git a/lib-build/debug-server/www_static/img/xensit-sm.png b/lib-build/debug-server/www_static/img/xensit-sm.png
deleted file mode 100644
index 7fafc38..0000000
Binary files a/lib-build/debug-server/www_static/img/xensit-sm.png and /dev/null differ
diff --git a/lib-build/debug-server/www_views/thtml/server/about.ejs b/lib-build/debug-server/www_views/thtml/server/about.ejs
index 0686d33..6108026 100644
--- a/lib-build/debug-server/www_views/thtml/server/about.ejs
+++ b/lib-build/debug-server/www_views/thtml/server/about.ejs
@@ -1,5 +1,5 @@
 <div>
 	<h2>About</h2>
-	<p>Testing debug server for xensit xnodes.</p>
+	<p>Testing debug server for xnodes.</p>
 	<p>Internal use only.</p>
 </div>
diff --git a/lib/xnode-shared/XnodeConstants.h b/lib/xnode-shared/XnodeConstants.h
index 43e79ec..33f11b0 100644
--- a/lib/xnode-shared/XnodeConstants.h
+++ b/lib/xnode-shared/XnodeConstants.h
@@ -29,8 +29,8 @@
 #define NET_BYTE_NET_KEY_SIZE 16
 #define NET_BYTE_NET_ID_SIZE 6
 
-// Net Xensit config
-//define NET_XNODE_HOST "xng.xensit.com" // XNodeGateway
+// Net config
+//define NET_XNODE_HOST "xng.server.local" // XNodeGateway
 #define NET_XNODE_HOST "www.forwardfire.net"
 #define NET_XNODE_MAC_DEFAULT {0x74,0x69,0x69,0x4D,0x33,0xB1}
 #define NET_PING_BOOT_TIME  1000*3
@@ -39,7 +39,7 @@
 #define NET_DNS_LOOKUP_TIME 1000*3600*1
 // TODO: make net time to secs as 1h is ~max for dns
 
-// Net config for url; Input Xensit Node Version A
+// Net config for url; Input Xnode Version A
 #define NET_URL_POST             "_a"
 #define NET_URL_PARA_POST_TYPE   "pt="
 #define NET_URL_PARA_REQ_CNT     "&rc="
diff --git a/protocol-a.txt b/protocol-a.txt
index 43f1192..361c084 100644
--- a/protocol-a.txt
+++ b/protocol-a.txt
@@ -1,9 +1,9 @@
 
-Protocol description Xnode-base to Xensit-server version A.
+Protocol description Xnode-base to server version A.
 
 == Abstract
 
-http-host:       beta.xensit.com
+http-host:       beta.server.local
 http-method:     POST
 http-uri:        _a
 http-param-get:  none
@@ -35,25 +35,25 @@ d = Sending Data
 
 == Example: Init cycle
 
-10.11.12.205 Mon, 17 Feb 2014 20:10:37 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=p&rc=55&ni=000000000000} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:10:37 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=p&rc=56&ni=000000000000} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=i&rc=59&ni=000000000000} R{Xinet_id 1234694D33B2}
-10.11.12.205 Mon, 17 Feb 2014 20:10:38 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=i&rc=57&ni=000000000000} R{Xinet_key 9A2EE3A293486E9FE73D77EFC8087D2F} 
-10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=i&rc=58&ni=1234694D33B2} R{Xirf_key 9A2EE3A293486E9FE73D77EFC8087D2F} 
-10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=i&rc=59&ni=1234694D33B2} R{Xinet_mac 7469694D33B2}
-10.11.12.205 Mon, 17 Feb 2014 20:10:40 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=i&rc=60&ni=1234694D33B2} R{Xireboot} 
-10.11.12.205 Mon, 17 Feb 2014 20:11:39 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=p&rc=55&ni=1234694D33B2} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:11:39 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=p&rc=56&ni=1234694D33B2} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:16:42 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=57&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:20:41 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=58&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:24:41 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=59&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:28:41 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=60&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
-10.11.12.205 Mon, 17 Feb 2014 20:32:40 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=61&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:10:37 +0000 URI{http://beta.server.local/_a} G{} P{pt=p&rc=55&ni=000000000000} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:10:37 +0000 URI{http://beta.server.local/_a} G{} P{pt=p&rc=56&ni=000000000000} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.server.local/_a} G{} P{pt=i&rc=59&ni=000000000000} R{Xinet_id 1234694D33B2}
+10.11.12.205 Mon, 17 Feb 2014 20:10:38 +0000 URI{http://beta.server.local/_a} G{} P{pt=i&rc=57&ni=000000000000} R{Xinet_key 9A2EE3A293486E9FE73D77EFC8087D2F} 
+10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.server.local/_a} G{} P{pt=i&rc=58&ni=1234694D33B2} R{Xirf_key 9A2EE3A293486E9FE73D77EFC8087D2F} 
+10.11.12.205 Mon, 17 Feb 2014 20:10:39 +0000 URI{http://beta.server.local/_a} G{} P{pt=i&rc=59&ni=1234694D33B2} R{Xinet_mac 7469694D33B2}
+10.11.12.205 Mon, 17 Feb 2014 20:10:40 +0000 URI{http://beta.server.local/_a} G{} P{pt=i&rc=60&ni=1234694D33B2} R{Xireboot} 
+10.11.12.205 Mon, 17 Feb 2014 20:11:39 +0000 URI{http://beta.server.local/_a} G{} P{pt=p&rc=55&ni=1234694D33B2} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:11:39 +0000 URI{http://beta.server.local/_a} G{} P{pt=p&rc=56&ni=1234694D33B2} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:16:42 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=57&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:20:41 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=58&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:24:41 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=59&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:28:41 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=60&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
+10.11.12.205 Mon, 17 Feb 2014 20:32:40 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=61&ni=1234694D33B2&nn=1&nd={rf_fail=1}} R{X} 
 
 == Example: Sensor data
 
-10.11.12.205 Tue, 18 Feb 2014 00:12:25 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=43&ni=1234694D33B2&nn=2&nd={sd_dht_hum=34.000\nsd_dht_temp=23.000}} R{X} 
-10.11.12.205 Tue, 18 Feb 2014 00:12:30 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=44&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=24.000}} R{X} 
-10.11.12.205 Tue, 18 Feb 2014 00:12:35 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=45&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=24.000}} R{X} 
-10.11.12.205 Tue, 18 Feb 2014 00:12:40 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=46&ni=1234694D33B2&nn=2&nd={sd_dht_hum=34.000\nsd_dht_temp=24.000}} R{X} 
-10.11.12.205 Tue, 18 Feb 2014 00:12:45 +0000 URI{http://beta.xensit.com/_a} G{} P{pt=d&rc=47&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=25.000}} R{X} 
+10.11.12.205 Tue, 18 Feb 2014 00:12:25 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=43&ni=1234694D33B2&nn=2&nd={sd_dht_hum=34.000\nsd_dht_temp=23.000}} R{X} 
+10.11.12.205 Tue, 18 Feb 2014 00:12:30 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=44&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=24.000}} R{X} 
+10.11.12.205 Tue, 18 Feb 2014 00:12:35 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=45&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=24.000}} R{X} 
+10.11.12.205 Tue, 18 Feb 2014 00:12:40 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=46&ni=1234694D33B2&nn=2&nd={sd_dht_hum=34.000\nsd_dht_temp=24.000}} R{X} 
+10.11.12.205 Tue, 18 Feb 2014 00:12:45 +0000 URI{http://beta.server.local/_a} G{} P{pt=d&rc=47&ni=1234694D33B2&nn=2&nd={sd_dht_hum=33.000\nsd_dht_temp=25.000}} R{X} 
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index 61f4daf..0000000
--- a/readme.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Xensit Xnode project
-
-This projects contains all packages to build the 
-software for all the different node types of the sensor network.
-
-