Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
===================================================================
--- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java	(revision 1420777)
+++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java	(working copy)
@@ -27,8 +27,8 @@
 import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
 import org.apache.jackrabbit.oak.plugins.index.IndexHookProvider;
 import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexHookProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider;
+import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexProvider;
 import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider;
 import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider;
 import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor;
@@ -70,10 +70,10 @@
         with(new RegistrationValidatorProvider());
         with(new ConflictValidatorProvider());
 
-        with(new PropertyIndexHookProvider());
+        with(new Property2IndexHookProvider());
         with(new AnnotatingConflictHandler());
 
-        with(new PropertyIndexProvider());
+        with(new Property2IndexProvider());
         with(new NodeTypeIndexProvider());
     }
 
Index: oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddTest.java
===================================================================
--- oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddTest.java	(revision 1420777)
+++ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddTest.java	(working copy)
@@ -25,7 +25,6 @@
 import javax.jcr.Session;
 
 import org.apache.jackrabbit.commons.iterator.NodeIterable;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.Iterables;
@@ -44,7 +43,6 @@
     private static final int NODES_PER_WORKER = 100;
 
     @Test
-    @Ignore("OAK-442")
     public void addNodes() throws Exception {
         List<Exception> exceptions = Collections.synchronizedList(
                 new ArrayList<Exception>());