diff --git a/.gitmodules b/.gitmodules
index 5361c803..20e2ea16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
-	url = https://github.com/Eiffel-World/Eiffel-Web-Framework.wiki.git
+	url = https://github.com/EiffelWebFramework/EWF.wiki.git
 [submodule "contrib/library/server/nino"]
 	path = contrib/library/server/nino
 	url = https://github.com/Eiffel-World/EiffelWebNino.git
 [submodule "contrib/library/text/parser/json"]
 	path = contrib/library/text/parser/json
-	url = https://github.com/Eiffel-World/ejson-svn.git
+	url = https://github.com/Eiffel-World/json.git
 [submodule "contrib/ise_library/cURL"]
 	path = contrib/ise_library/cURL
 	url = https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git
diff --git a/README.md b/README.md
index 0fad2db1..5918d22d 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@
 
 Official project site for Eiffel Web Framework:
 
-* http://eiffel-world.github.com/Eiffel-Web-Framework/
+* http://eiffelwebframework.github.com/EWF/
 
 For more information please have a look at the related wiki:
 
-* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
+* https://github.com/EiffelWebFramework/EWF/wiki
 
 ## Requirements
 
@@ -20,10 +20,10 @@ For more information please have a look at the related wiki:
 ## How to get the source code?
 
 Using git version >= 1.6.5
-* git clone --recursive https://github.com/Eiffel-World/Eiffel-Web-Framework.git
+* git clone --recursive https://github.com/EiffelWebFramework/EWF.git
 
 Otherwise, try
-* git clone https://github.com/Eiffel-World/Eiffel-Web-Framework.git
+* git clone https://github.com/EiffelWebFramework/EWF.git
 * cd Eiffel-Web-Framework
 * git submodule update --init
 * git submodule foreach --recursive git checkout master
@@ -77,4 +77,4 @@ An alternative to the last 2 instructions is to use the script from tools folder
 
 
 For more information please have a look at the related wiki:
-* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
+* https://github.com/EiffelWebFramework/EWF/wiki
diff --git a/contrib/library/text/parser/json b/contrib/library/text/parser/json
index 769bb7d1..c873d62e 160000
--- a/contrib/library/text/parser/json
+++ b/contrib/library/text/parser/json
@@ -1 +1 @@
-Subproject commit 769bb7d16163339b1347150ed7355aaaad9dd71f
+Subproject commit c873d62efa58ab1da3223cebd8e4f4670b24cd72