diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/idempiere.cquery
similarity index 72%
rename from org.adempiere.sdk-feature/adempiere.cquery
rename to org.adempiere.sdk-feature/idempiere.cquery
index 77de0983b6..157328d4da 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/idempiere.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="http://hengsin.googlecode.com/hg/adempiere.rmap">
+<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="http://idempiere.bitbucket.org/hg/idempiere.rmap">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/idempiere.rmap
similarity index 96%
rename from org.adempiere.sdk-feature/adempiere.rmap
rename to org.adempiere.sdk-feature/idempiere.rmap
index 4ad955f427..063aa8cefd 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/idempiere.rmap
@@ -35,7 +35,7 @@
   </rm:searchPath>
   <rm:searchPath name="external.p2">
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
-      <rm:uri format="http://hengsin.googlecode.com/hg/adempiere.osgi.dep-1.0.0/p2"/>
+      <rm:uri format="http://idempiere.bitbucket.org/hg/idempiere.osgi.dep-1.0.0/p2"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="orbit">