diff --git a/build/build-config/pom.xml b/build/build-config/pom.xml
index e8a0cf3a7d..c2dc571085 100644
--- a/build/build-config/pom.xml
+++ b/build/build-config/pom.xml
@@ -117,11 +117,11 @@
                                     <outputDirectory>${tmpdir.dependencies-javadoc-packagelists}/el-api</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.javamoney</groupId>
-                                    <artifactId>moneta</artifactId>
+                                    <groupId>javax.money</groupId>
+                                    <artifactId>money-api</artifactId>
                                     <classifier>javadoc</classifier>
                                     <type>jar</type>
-                                    <version>${version.org.javamoney.moneta}</version>
+                                    <version>${version.javax.money}</version>
                                     <outputDirectory>${tmpdir.dependencies-javadoc-packagelists}/javamoney-api</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
diff --git a/engine/pom.xml b/engine/pom.xml
index df97bc17ec..fd396d459a 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -160,8 +160,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
+            <groupId>org.javamoney.moneta</groupId>
+            <artifactId>moneta-core</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/integrationtest/wildfly/pom.xml b/integrationtest/wildfly/pom.xml
index d3ae47af93..1d9efab92c 100644
--- a/integrationtest/wildfly/pom.xml
+++ b/integrationtest/wildfly/pom.xml
@@ -68,8 +68,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
+            <groupId>org.javamoney.moneta</groupId>
+            <artifactId>moneta-core</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -206,8 +206,8 @@
                                     <outputDirectory>${wildfly.modules-dir}/javax/money/api/main/</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.javamoney</groupId>
-                                    <artifactId>moneta</artifactId>
+                                    <groupId>org.javamoney.moneta</groupId>
+                                    <artifactId>moneta-core</artifactId>
                                     <version>${version.org.javamoney.moneta}</version>
                                     <outputDirectory>${wildfly.modules-dir}/org/javamoney/moneta/main/</outputDirectory>
                                 </artifactItem>
diff --git a/integrationtest/wildfly/src/test/modules/org/javamoney/moneta/main/module.xml b/integrationtest/wildfly/src/test/modules/org/javamoney/moneta/main/module.xml
index e951d6d356..607272cd7e 100644
--- a/integrationtest/wildfly/src/test/modules/org/javamoney/moneta/main/module.xml
+++ b/integrationtest/wildfly/src/test/modules/org/javamoney/moneta/main/module.xml
@@ -5,7 +5,7 @@
 -->
 <module xmlns="urn:jboss:module:1.3" name="org.javamoney.moneta" slot="main">
 	<resources>
-		<resource-root path="moneta-${version.org.javamoney.moneta}.jar" />
+		<resource-root path="moneta-core-${version.org.javamoney.moneta}.jar" />
 	</resources>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index 1a553b4d83..0123d4e0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
 
         <!-- JavaMoney dependencies -->
         <version.javax.money>1.1</version.javax.money>
-        <version.org.javamoney.moneta>1.1</version.org.javamoney.moneta>
+        <version.org.javamoney.moneta>1.4.5</version.org.javamoney.moneta>
         <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
 
         <!-- Used in the Karaf features file: it is a dependency of Moneta, and for the documentation -->
@@ -509,8 +509,8 @@
                 <version>${version.javax.money}</version>
             </dependency>
             <dependency>
-                <groupId>org.javamoney</groupId>
-                <artifactId>moneta</artifactId>
+                <groupId>org.javamoney.moneta</groupId>
+                <artifactId>moneta-core</artifactId>
                 <version>${version.org.javamoney.moneta}</version>
             </dependency>
             <dependency>