diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5231c2f9..7e1288b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,35 +2,35 @@
 
 ## r10 (2017/08/13)
 
-* New release : 2.14.1 (Issue crazy-max/neard#306)
+* New release : 2.14.1 (Issue neard/neard#306)
 
 ## r9 (2017/07/04)
 
-* New release : 2.13.2 (Issue crazy-max/neard#279)
+* New release : 2.13.2 (Issue neard/neard#279)
 
 ## r8 (2017/05/17)
 
-* New release : 2.13.0 (Issue crazy-max/neard#257)
+* New release : 2.13.0 (Issue neard/neard#257)
 
 ## r7 (2017/03/22)
 
-* New release : 2.12.1 (Issue crazy-max/neard#235)
+* New release : 2.12.1 (Issue neard/neard#235)
 
 ## r6 (2016/12/02)
 
-* New release : 2.11.0 (Issue crazy-max/neard#177)
+* New release : 2.11.0 (Issue neard/neard#177)
 
 ## r5 (2016/10/11)
 
-* New release : 2.10.1 (Issue crazy-max/neard#121)
+* New release : 2.10.1 (Issue neard/neard#121)
 
 ## r4 (2016/06/20)
 
-* New release : 2.9.0 (Issue crazy-max/neard#121)
+* New release : 2.9.0 (Issue neard/neard#121)
 
 ## r3 (2016/05/12)
 
-* New release : 2.8.2 (Issue crazy-max/neard#121)
+* New release : 2.8.2 (Issue neard/neard#121)
 
 ## r2 (2016/04/12)
 
diff --git a/README.md b/README.md
index c5824e23..08708239 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![GitHub release](https://img.shields.io/github/release/crazy-max/neard-tool-git.svg?style=flat-square)](https://github.com/crazy-max/neard-tool-git/releases/latest)
-![Total downloads](https://img.shields.io/github/downloads/crazy-max/neard-tool-git/total.svg?style=flat-square)
+[![GitHub release](https://img.shields.io/github/release/neard/module-git.svg?style=flat-square)](https://github.com/neard/module-git/releases/latest)
+![Total downloads](https://img.shields.io/github/downloads/neard/module-git/total.svg?style=flat-square)
 
-This is a module of [Neard project](https://github.com/crazy-max/neard) involving Git.
+This is a module of [Neard project](https://github.com/neard/neard) involving Git.
 
 ## Documentation and downloads
 
@@ -9,4 +9,4 @@ http://neard.io/modules/git
 
 ## Issues
 
-Issues must be reported on [Neard repository](https://github.com/crazy-max/neard/issues).
+Issues must be reported on [Neard repository](https://github.com/neard/neard/issues).
diff --git a/build.xml b/build.xml
index 3e8a6441..cc9c6597 100644
--- a/build.xml
+++ b/build.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="neard-tool-git" basedir=".">
+<project name="module-git" basedir=".">
   
-  <dirname property="project.basedir" file="${ant.file.neard-tool-git}"/>
+  <dirname property="project.basedir" file="${ant.file.module-git}"/>
   <property name="root.dir" location="${project.basedir}/.."/>
   <property name="build.properties" value="${project.basedir}/build.properties"/>
   <property file="${build.properties}"/>
   
   <!-- Neard dev -->
-  <property name="neard-dev.path" location="${root.dir}/neard-dev"/>
-  <fail unless="neard-dev.path" message="Project 'neard-dev' not found in ${neard-dev.path}"/>
-  <echo message="Neard dev found in ${neard-dev.path}" level="debug"/> 
+  <property name="dev.path" location="${root.dir}/dev"/>
+  <fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
+  <echo message="Neard dev found in ${dev.path}" level="debug"/> 
   
   <!-- Import build-commons.xml -->
-  <import file="${neard-dev.path}/build/build-commons.xml"/>
+  <import file="${dev.path}/build/build-commons.xml"/>
   <!-- Import build-bundle.xml -->
-  <import file="${neard-dev.path}/build/build-bundle.xml"/>
+  <import file="${dev.path}/build/build-bundle.xml"/>
   
   <target name="release.build">
     <basename property="bundle.folder" file="${bundle.path}"/>
diff --git a/releases.properties b/releases.properties
index e702c2be..28000e82 100644
--- a/releases.properties
+++ b/releases.properties
@@ -1,10 +1,10 @@
-1.8.4 = https://github.com/crazy-max/neard-tool-git/releases/download/r1/neard-git-1.8.4-r1.7z
-2.8.1 = https://github.com/crazy-max/neard-tool-git/releases/download/r2/neard-git-2.8.1-r2.7z
-2.8.2 = https://github.com/crazy-max/neard-tool-git/releases/download/r3/neard-git-2.8.2-r3.7z
-2.9.0 = https://github.com/crazy-max/neard-tool-git/releases/download/r4/neard-git-2.9.0-r4.7z
-2.10.1 = https://github.com/crazy-max/neard-tool-git/releases/download/r5/neard-git-2.10.1-r5.7z
-2.11.0 = https://github.com/crazy-max/neard-tool-git/releases/download/r6/neard-git-2.11.0-r6.7z
-2.12.1 = https://github.com/crazy-max/neard-tool-git/releases/download/r7/neard-git-2.12.1-r7.7z
-2.13.0 = https://github.com/crazy-max/neard-tool-git/releases/download/r8/neard-git-2.13.0-r8.7z
-2.13.2 = https://github.com/crazy-max/neard-tool-git/releases/download/r9/neard-git-2.13.2-r9.7z
-2.14.1 = https://github.com/crazy-max/neard-tool-git/releases/download/r10/neard-git-2.14.1-r10.7z
+1.8.4 = https://github.com/neard/module-git/releases/download/r1/neard-git-1.8.4-r1.7z
+2.8.1 = https://github.com/neard/module-git/releases/download/r2/neard-git-2.8.1-r2.7z
+2.8.2 = https://github.com/neard/module-git/releases/download/r3/neard-git-2.8.2-r3.7z
+2.9.0 = https://github.com/neard/module-git/releases/download/r4/neard-git-2.9.0-r4.7z
+2.10.1 = https://github.com/neard/module-git/releases/download/r5/neard-git-2.10.1-r5.7z
+2.11.0 = https://github.com/neard/module-git/releases/download/r6/neard-git-2.11.0-r6.7z
+2.12.1 = https://github.com/neard/module-git/releases/download/r7/neard-git-2.12.1-r7.7z
+2.13.0 = https://github.com/neard/module-git/releases/download/r8/neard-git-2.13.0-r8.7z
+2.13.2 = https://github.com/neard/module-git/releases/download/r9/neard-git-2.13.2-r9.7z
+2.14.1 = https://github.com/neard/module-git/releases/download/r10/neard-git-2.14.1-r10.7z