diff --git a/org.springframework.agent/pom.xml b/org.springframework.agent/pom.xml
deleted file mode 100644
index f820fa6d699..00000000000
--- a/org.springframework.agent/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework</groupId>
-	<artifactId>org.springframework.agent</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Agent</name>
-	<version>3.0.0.M1</version>
-	<repositories>
-		<repository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/external</url>
-		</repository>		
-	</repositories>
-	<build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/org.springframework.agent/.classpath b/org.springframework.instrument/.classpath
similarity index 100%
rename from org.springframework.agent/.classpath
rename to org.springframework.instrument/.classpath
diff --git a/org.springframework.agent/.project b/org.springframework.instrument/.project
similarity index 100%
rename from org.springframework.agent/.project
rename to org.springframework.instrument/.project
diff --git a/org.springframework.agent/.settings/org.eclipse.jdt.core.prefs b/org.springframework.instrument/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.springframework.agent/.settings/org.eclipse.jdt.core.prefs
rename to org.springframework.instrument/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.springframework.agent/build.xml b/org.springframework.instrument/build.xml
similarity index 83%
rename from org.springframework.agent/build.xml
rename to org.springframework.instrument/build.xml
index 1cec08a2e6f..237154117b5 100644
--- a/org.springframework.agent/build.xml
+++ b/org.springframework.instrument/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.agent">
+<project name="org.springframework.instrument">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
diff --git a/org.springframework.agent/ivy.xml b/org.springframework.instrument/ivy.xml
similarity index 100%
rename from org.springframework.agent/ivy.xml
rename to org.springframework.instrument/ivy.xml
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
new file mode 100644
index 00000000000..838a192ade2
--- /dev/null
+++ b/org.springframework.instrument/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+    <parent>
+	    <groupId>org.springframework</groupId>
+	    <artifactId>org.springframework.parent</artifactId>
+	    <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+	<artifactId>org.springframework.agent</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Agent</name>
+</project>
\ No newline at end of file
diff --git a/org.springframework.agent/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java b/org.springframework.instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
similarity index 100%
rename from org.springframework.agent/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
rename to org.springframework.instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
diff --git a/org.springframework.agent/src/main/java/overview.html b/org.springframework.instrument/src/main/java/overview.html
similarity index 100%
rename from org.springframework.agent/src/main/java/overview.html
rename to org.springframework.instrument/src/main/java/overview.html
diff --git a/org.springframework.agent/src/test/resources/log4j.xml b/org.springframework.instrument/src/test/resources/log4j.xml
similarity index 100%
rename from org.springframework.agent/src/test/resources/log4j.xml
rename to org.springframework.instrument/src/test/resources/log4j.xml
diff --git a/org.springframework.agent/template.mf b/org.springframework.instrument/template.mf
similarity index 60%
rename from org.springframework.agent/template.mf
rename to org.springframework.instrument/template.mf
index 98fc53157eb..3c314d6aa6c 100644
--- a/org.springframework.agent/template.mf
+++ b/org.springframework.instrument/template.mf
@@ -1,5 +1,5 @@
-Bundle-SymbolicName: org.springframework.agent
-Bundle-Name: Spring Core
+Bundle-SymbolicName: org.springframework.instrument
+Bundle-Name: Spring Instrument
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Premain-Class: org.springframework.instrument.InstrumentationSavingAgent