Initial rename (before testing)

44 files changed, 230 insertions, 230 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java
index 7b5386984..6a84a8965 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AbstractProvisioningTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java
@@ -6,19 +6,19 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
 
 import java.util.*;
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
index bf2dc9d51..1c91a8326 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AutomatedTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
 
 import junit.framework.*;
 
@@ -20,10 +20,10 @@ import junit.framework.*;
 public class AutomatedTests extends TestCase {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(AutomatedTests.class.getName());
-		suite.addTest(org.eclipse.equinox.prov.tests.director.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.prov.tests.download.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.prov.tests.engine.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.prov.tests.metadata.AllTests.suite());
+		suite.addTest(org.eclipse.equinox.p2.tests.director.AllTests.suite());
+		suite.addTest(org.eclipse.equinox.p2.tests.download.AllTests.suite());
+		suite.addTest(org.eclipse.equinox.p2.tests.engine.AllTests.suite());
+		suite.addTest(org.eclipse.equinox.p2.tests.metadata.AllTests.suite());
 		return suite;
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestActivator.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestActivator.java
index 9cef88a04..aa1cb27e9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestActivator.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestActivator.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
 
 import org.osgi.framework.*;
 import org.osgi.service.packageadmin.PackageAdmin;
 
 public class TestActivator implements BundleActivator {
-	public static final String PI_PROV_TESTS = "org.eclipse.equinox.prov.test";
+	public static final String PI_PROV_TESTS = "org.eclipse.equinox.p2.test";
 	public static BundleContext context;
 	private static PackageAdmin packageAdmin = null;
 	private static ServiceReference packageAdminRef = null;
@@ -29,7 +29,7 @@ public class TestActivator implements BundleActivator {
 		packageAdmin = (PackageAdmin) context.getService(packageAdminRef);
 
 		//This is a hack because the junit plugin launch config do not allow to start bundles
-		getBundle("org.eclipse.equinox.prov.examplarysetup").start();
+		getBundle("org.eclipse.equinox.p2.examplarysetup").start();
 		getBundle("org.eclipse.equinox.frameworkadmin.equinox").start();
 		getBundle("org.eclipse.equinox.simpleconfigurator.manipulator").start();
 	}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestArtifactRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
index ada291281..a884c659b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
@@ -6,7 +6,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
 
 import java.io.*;
 import java.net.*;
@@ -14,14 +14,14 @@ import java.util.HashMap;
 import java.util.Map;
 import junit.framework.Assert;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.artifact.repository.ArtifactRequest;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepHandler;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
 
 /**
  * A simple artifact repository implementation used for testing purposes.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestMetadataRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
index 99cf56c03..8b4524097 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
@@ -6,7 +6,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,13 +15,13 @@ import java.net.URL;
 import java.util.*;
 import junit.framework.Assert;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.query.CompoundIterator;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.query.CompoundIterator;
 import org.eclipse.osgi.service.resolver.VersionRange;
 
 /**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/AllTests.java
index 496438193..d2e806771 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository;
+package org.eclipse.equinox.p2.tests.artifact.repository;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java
index 8b8d60772..861221393 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/JarURLRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java
@@ -1,12 +1,12 @@
-package org.eclipse.equinox.prov.tests.artifact.repository;
+package org.eclipse.equinox.p2.tests.artifact.repository;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.metadata.ArtifactKey;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 
@@ -42,6 +42,6 @@ public class JarURLRepositoryTest extends TestCase {
 			fail(e.getMessage());
 		}
 		IArtifactRepository repo = manager.loadRepository(jarRepoURL, null);
-		assertTrue(repo.contains(new ArtifactKey("eclipse", "plugin", "org.eclipse.equinox.prov.engine", new Version("0.1.0.200709241631"))));
+		assertTrue(repo.contains(new ArtifactKey("eclipse", "plugin", "org.eclipse.equinox.p2.engine", new Version("0.1.0.200709241631"))));
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Adder.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java
index 8d23231b7..6854545eb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Adder.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java
@@ -9,15 +9,15 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.IOException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
 
 public class Adder extends ProcessingStep {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ByteShifter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java
index 6ed97709d..bcf307119 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ByteShifter.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java
@@ -9,15 +9,15 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.IOException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
 
 public class ByteShifter extends ProcessingStep {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Counter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
index f21e0265e..c13e22b13 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Counter.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
@@ -8,15 +8,15 @@
 * Contributors:
 * 	IBM Corporation - initial API and implementation
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.IOException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
 
 public class Counter extends ProcessingStep {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/MD5Verifier.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/MD5Verifier.java
index 5609874a2..56758cc6b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/MD5Verifier.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/MD5Verifier.java
@@ -9,17 +9,17 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
 
 public class MD5Verifier extends ProcessingStep {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Multiplier.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java
index 611fd8b7a..05f0550b8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Multiplier.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java
@@ -9,15 +9,15 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.IOException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
 
 public class Multiplier extends ProcessingStep {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Pack200Unpacker.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Pack200Unpacker.java
index ac0e57689..a05988dd7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Pack200Unpacker.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Pack200Unpacker.java
@@ -9,20 +9,20 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
 import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep;
 import org.eclipse.equinox.internal.p2.jarprocessor.Utils;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
 import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor;
 import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor.Options;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
 
 /**
  * The Pack200Unpacker expects an input containing ".jar.pack.gz" data.   
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ProcessingStepHandlerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
index d7006c219..4f7e2eea4 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
@@ -9,15 +9,15 @@
 * 	compeople AG (Stefan Liebig) - initial API and implementation
 *  IBM - continuing development
 *******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
 
 import java.io.*;
 import java.util.Arrays;
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.*;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.artifact.repository.processing.*;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.tests.TestActivator;
 
 public class ProcessingStepHandlerTest extends TestCase {
 
@@ -129,45 +129,45 @@ public class ProcessingStepHandlerTest extends TestCase {
 	}
 
 	public void testCreateByteShifterPS() {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.ByteShifter", "1", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.ByteShifter", "1", true);
 		ProcessingStep step = handler.create(descriptor, null);
 		assertNotNull(step);
 		assertEquals(ByteShifter.class, step.getClass());
 	}
 
 	public void testCreateMD5VerifierPS() {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.MD5Verifier", "1", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.MD5Verifier", "1", true);
 		ProcessingStep step = handler.create(descriptor, null);
 		assertNotNull(step);
 		assertEquals(MD5Verifier.class, step.getClass());
 	}
 
 	public void testCreateAdderPS() {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
 		ProcessingStep step = handler.create(descriptor, null);
 		assertNotNull(step);
 		assertEquals(Adder.class, step.getClass());
 	}
 
 	public void testCreateMultiplierPS() {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
 		ProcessingStep step = handler.create(descriptor, null);
 		assertNotNull(step);
 		assertEquals(Multiplier.class, step.getClass());
 	}
 
 	public void testCreatePack200UnpackerPS() {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Pack200Unpacker", null, true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true);
 		ProcessingStep step = handler.create(descriptor, null);
 		assertNotNull(step);
 		assertEquals(Pack200Unpacker.class, step.getClass());
 	}
 
 	public void testCreatePSsAndAssureOrderingOfPSs1() throws IOException {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
 		ProcessingStep adder = handler.create(descriptor, null);
 
-		descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+		descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
 		ProcessingStep multiplier = handler.create(descriptor, null);
 
 		ProcessingStep[] steps = new ProcessingStep[] {adder, multiplier};
@@ -179,10 +179,10 @@ public class ProcessingStepHandlerTest extends TestCase {
 	}
 
 	public void testCreatePSsAndAssureOrderingOfPSs2() throws IOException {
-		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+		ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
 		ProcessingStep adder = handler.create(descriptor, null);
 
-		descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+		descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
 		ProcessingStep multiplier = handler.create(descriptor, null);
 
 		ProcessingStep[] steps = new ProcessingStep[] {multiplier, adder};
@@ -194,8 +194,8 @@ public class ProcessingStepHandlerTest extends TestCase {
 	}
 
 	public void testLinkPSs() throws IOException {
-		ProcessingStepDescriptor descriptor1 = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
-		ProcessingStepDescriptor descriptor2 = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+		ProcessingStepDescriptor descriptor1 = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
+		ProcessingStepDescriptor descriptor2 = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
 		ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {descriptor1, descriptor2};
 		ByteArrayOutputStream result = new ByteArrayOutputStream(10);
 		OutputStream testStream = handler.createAndLink(descriptors, null, result, monitor);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AllTests.java
index 1d1645b90..feced95bd 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AutomatedDirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java
index 29be504c9..593b504dc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AutomatedDirectorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java
@@ -6,16 +6,16 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.osgi.framework.Version;
 
 /**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/Bug203637.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java
index eea4af549..2a0aae30a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/Bug203637.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java
@@ -6,13 +6,13 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.osgi.framework.Version;
 
 public class Bug203637 extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OperationGenerationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
index 560c60688..158658b04 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OperationGenerationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
@@ -6,15 +6,15 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.director.OperationGenerator;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.internal.p2.director.OperationGenerator;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
 import org.osgi.framework.Version;
 
 public class OperationGenerationTest extends TestCase {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java
index 74e8e7ad9..a658f6728 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java
@@ -6,14 +6,14 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest2.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java
index 896e5ebd6..05ea7b9fa 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest2.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java
@@ -6,15 +6,15 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import java.util.Collection;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/PickerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java
index 22452040c..6f3ef7402 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/PickerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.director.Picker;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.director.Picker;
+import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/RollbackTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java
index cb0400878..91cdd46eb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/RollbackTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java
@@ -6,21 +6,21 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import java.net.URL;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.director.DirectorActivator;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.director.DirectorActivator;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.osgi.framework.Version;
 
 public class RollbackTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/SingletonTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java
index 016ce7882..1522e9baa 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/SingletonTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java
@@ -6,15 +6,15 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.osgi.framework.Version;
 
 public class SingletonTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UninstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java
index 43a70fc70..65efb55b7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UninstallTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java
@@ -6,13 +6,13 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.osgi.framework.Version;
 
 public class UninstallTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithEntryPoint.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithEntryPoint.java
index b5a535bc8..64f20370e 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithEntryPoint.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithEntryPoint.java
@@ -6,17 +6,17 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import java.util.Collection;
 import java.util.Iterator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.osgi.framework.Version;
 
 public class UpdateTestWithEntryPoint extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithoutEntryPoint.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithoutEntryPoint.java
index a67c5daeb..2bef12e17 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithoutEntryPoint.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithoutEntryPoint.java
@@ -6,16 +6,16 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
 
 import java.util.Iterator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/AllTests.java
index 77c6b26c4..2c5e05221 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.download;
+package org.eclipse.equinox.p2.tests.download;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/DownloadManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java
index f6e579e84..a615da4dc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/DownloadManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java
@@ -6,11 +6,11 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.download;
+package org.eclipse.equinox.p2.tests.download;
 
 import junit.framework.*;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.download.DownloadManager;
+import org.eclipse.equinox.p2.download.DownloadManager;
 
 /**
  * Simple tests of {@link DownloadManager} API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
index ffdbf9eb7..b53229e5b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/EngineTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java
index 4318a8064..0e15a4504 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/EngineTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
 
 import java.util.*;
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.metadata.ArtifactKey;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseSetTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
index c9ee4556b..ff793c316 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseSetTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
 
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.metadata.ResolvedInstallableUnit;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.ResolvedInstallableUnit;
 
 /**
  * Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java
index 3c76faf39..d9bb6ee1c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
 
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.engine.*;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.engine.*;
 
 /**
  * Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
index 77be6d95c..b4884dfec 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/ProfileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
 
 import junit.framework.TestCase;
-import org.eclipse.equinox.prov.engine.Profile;
+import org.eclipse.equinox.p2.engine.Profile;
 
 /**
  * Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/DirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java
index c6441182e..00ac1a06c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/DirectorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java
@@ -8,27 +8,27 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.full;
+package org.eclipse.equinox.p2.tests.full;
 
 import java.util.Collection;
 import java.util.Iterator;
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IResolvedInstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IResolvedInstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.osgi.framework.ServiceReference;
 
 /**
- * This test installs or uninstalls the IU defined by the property "eclipse.prov.autoInstall".
+ * This test installs or uninstalls the IU defined by the property "eclipse.p2.autoInstall".
  * Metadata for the IUs to install must be generated separately before running this test.
  */
 public class DirectorTest extends TestCase {
@@ -66,8 +66,8 @@ public class DirectorTest extends TestCase {
 		}
 
 		String profileId = installFolder;
-		String newFlavor = System.getProperty("eclipse.prov.configurationFlavor");
-		boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.prov.doUninstall"))));
+		String newFlavor = System.getProperty("eclipse.p2.configurationFlavor");
+		boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.p2.doUninstall"))));
 
 		Profile p = profileRegistry.getProfile(profileId);
 		if (p == null) {
@@ -92,7 +92,7 @@ public class DirectorTest extends TestCase {
 			p.setValue(Profile.PROP_ENVIRONMENTS, "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch());
 
 		IInstallableUnit[] allRoots = new IInstallableUnit[1];
-		Collection allJobs = allIUs.getAll(System.getProperty("eclipse.prov.autoInstall"));
+		Collection allJobs = allIUs.getAll(System.getProperty("eclipse.p2.autoInstall"));
 		IStatus operationStatus = null;
 		if (allJobs.size() != 0) {
 			allRoots[0] = (IInstallableUnit) allJobs.iterator().next();
@@ -102,7 +102,7 @@ public class DirectorTest extends TestCase {
 				operationStatus = director.uninstall(allRoots, p, new NullProgressMonitor());
 			}
 		} else {
-			operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.prov.director.test", "The installable unit '" + System.getProperty("eclipse.prov.autoInstall") + "' has not been found");
+			operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.p2.director.test", "The installable unit '" + System.getProperty("eclipse.p2.autoInstall") + "' has not been found");
 		}
 
 		if (operationStatus.isOK()) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/End2EndTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java
index d3e23507d..639d26c9a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/End2EndTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java
@@ -6,22 +6,22 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.full;
+package org.eclipse.equinox.p2.tests.full;
 
 import java.util.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.ServiceReference;
@@ -54,8 +54,8 @@ public class End2EndTest extends AbstractProvisioningTest {
 			throw new RuntimeException("Profile registry service not available");
 		}
 
-		String newFlavor = System.getProperty("eclipse.prov.configurationFlavor");
-		boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.prov.doUninstall"))));
+		String newFlavor = System.getProperty("eclipse.p2.configurationFlavor");
+		boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.p2.doUninstall"))));
 
 		Profile profile1 = profileRegistry.getProfile(profileId);
 		if (profile1 == null) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/AllTests.java
index 4a6c0b4b1..7c37d1269 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentMethodTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java
index 4e8613c1a..3de97a802 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentMethodTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import java.util.*;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
index 81696d911..db9a72c70 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import java.util.*;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/MultipleIUAndFragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
index 760758942..bce261ed5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/MultipleIUAndFragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import java.util.*;
 import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/OldTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/OldTest.java
index db71c19ae..bd4c2e0e9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/OldTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/OldTest.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import com.thoughtworks.xstream.XStream;
 import java.io.*;
 import java.util.ArrayList;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.Transformer;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.Transformer;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.eclipse.osgi.service.resolver.*;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/RecommendationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/RecommendationTest.java
index 6cd05bae8..eb5d2ec33 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/RecommendationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/RecommendationTest.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Set;
 import junit.framework.TestCase;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.director.Picker;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.director.Picker;
+import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/ResolutionHelperTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ResolutionHelperTest.java
index 21dd45b3c..c5926ba45 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/ResolutionHelperTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ResolutionHelperTest.java
@@ -6,15 +6,15 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
 
 import java.util.*;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
-import org.eclipse.equinox.prov.resolution.UnsatisfiedCapability;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.resolution.UnsatisfiedCapability;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllTests.java
index 532adb148..1cc3e3085 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata.repository;
+package org.eclipse.equinox.p2.tests.metadata.repository;
 
 import junit.framework.*;
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
index 5277f277d..a717829d1 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/JarURLRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
@@ -1,11 +1,11 @@
-package org.eclipse.equinox.prov.tests.metadata.repository;
+package org.eclipse.equinox.p2.tests.metadata.repository;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
 import org.osgi.framework.ServiceReference;
 
 public class JarURLRepositoryTest extends TestCase {