diff --git a/off-heap/pom.xml b/off-heap/pom.xml
index 257827194b85..9eb2072d528a 100755
--- a/off-heap/pom.xml
+++ b/off-heap/pom.xml
@@ -23,7 +23,7 @@
         <pax.exam.version>3.4.0</pax.exam.version>
         <pax.url.version>1.6.0</pax.url.version>
         <logback.version>0.9.6</logback.version>
-        <openhft.lang.version>6.3</openhft.lang.version>
+        <openhft.lang.version>6.3.4-SNAPSHOT</openhft.lang.version>
         <openhft.hugecollections.version>4.0.0</openhft.hugecollections.version>
         <osgi.version>5.0.0</osgi.version>
     </properties>
@@ -64,12 +64,12 @@
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>collections</artifactId>
-            <version>3.0c</version>
+            <version>3.0e-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>lang</artifactId>
-            <version>${openhft.lang.version}</version>
+            <version>6.3.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.openhft</groupId>
@@ -121,6 +121,7 @@
             <artifactId>org.apache.felix.framework</artifactId>
             <version>4.2.1</version>
         </dependency>
+<!--
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -131,6 +132,7 @@
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
         </dependency>
+-->
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>compiler</artifactId>
diff --git a/off-heap/src/main/java/org/infinispan/offheap/container/versioning/OffheapNumericVersion.java b/off-heap/src/main/java/org/infinispan/offheap/container/versioning/OffHeapNumericVersion.java
similarity index 100%
rename from off-heap/src/main/java/org/infinispan/offheap/container/versioning/OffheapNumericVersion.java
rename to off-heap/src/main/java/org/infinispan/offheap/container/versioning/OffHeapNumericVersion.java
diff --git a/off-heap/src/main/resources/infinispan-off-heap-component-metadata.dat b/off-heap/src/main/resources/infinispan-off-heap-component-metadata.dat
index 94c2670a4748..cf70f6164bf1 100644
Binary files a/off-heap/src/main/resources/infinispan-off-heap-component-metadata.dat and b/off-heap/src/main/resources/infinispan-off-heap-component-metadata.dat differ
diff --git a/pom.xml b/pom.xml
index 942108eb435f..ea68d9e19ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,12 +21,12 @@
       <module>parent</module>
       <module>commons</module>
       <module>core</module>
-	<module>extended-statistics</module> 
-	<module>tools</module> 
+      <module>extended-statistics</module>
+      <module>tools</module>
       <module>query</module>
       <module>query-dsl</module>
       <module>remote-query/remote-query-client</module>
-      <module>remote-query/remote-query-server</module> 
+      <module>remote-query/remote-query-server</module>
       <module>tree</module>
       <module>lucene</module>
       <module>lucene/lucene-directory</module>
@@ -34,18 +34,19 @@
       <module>lucene/lucene-v3</module>
       <module>persistence</module>
       <module>persistence/jdbc</module>
+      <module>persistence/jpa</module>
       <module>persistence/remote</module>
       <module>persistence/cli</module>
       <module>persistence/leveldb</module>
       <module>persistence/rest</module>
-	<module>server</module>
+      <module>server</module>
       <module>server/core</module>
       <module>server/memcached</module>
       <module>server/hotrod</module>
       <module>server/websocket</module>
-      <module>server/rest</module> 
-      <module>client/hotrod-client</module> 
-<!--	<module>rhq-plugin</module> -->
+      <module>server/rest</module>
+      <module>client/hotrod-client</module>
+      <module>rhq-plugin</module>
       <module>spring</module>
       <module>cli/cli-server</module>
       <module>cli/cli-client</module>
@@ -55,7 +56,7 @@
       <module>demos/ec2-ui</module>
       <module>demos/directory</module>
       <module>demos/lucene-directory-demo</module>
-	<module>demos/gridfs-webdav</module> 
+      <module>demos/gridfs-webdav</module>
       <module>demos/nearcache</module>
       <module>demos/nearcache-client</module>
       <module>cdi/extension</module>
@@ -65,9 +66,8 @@
       <module>integrationtests/compatibility-mode-it</module>
       <module>integrationtests/cdi-jcache-it</module>
       <module>jcache</module>
-      <module>off-heap</module>
       <module>server/integration</module>
-      <module>off-heap</module>
+           <module>off-heap</module>
    </modules>
 
    <profiles>