diff --git a/sandbox/openid/pom.xml b/sandbox/openid/pom.xml
index a662f9d653..7da42bbaa9 100644
--- a/sandbox/openid/pom.xml
+++ b/sandbox/openid/pom.xml
@@ -2,13 +2,13 @@
          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.acegisecurity</groupId>
-        <artifactId>acegi-security-sandbox</artifactId>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-sandbox</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>acegi-security-openid</artifactId>
-    <name>Acegi Security System for Spring - OpenID support</name>
-    <description>Acegi Security System for Spring - Support for OpenID</description>
+    <artifactId>spring-security-openid</artifactId>
+    <name>Spring Security System - OpenID support</name>
+    <description>Spring Security - Support for OpenID</description>
     <version>0.1-SNAPSHOT</version>
 
     <repositories>
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/providers/openid/AuthenticationCancelledException.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/providers/openid/AuthenticationCancelledException.java
rename to sandbox/openid/src/main/java/org/springframework/security/providers/openid/AuthenticationCancelledException.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProvider.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProvider.java
rename to sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationProvider.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationStatus.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationStatus.java
rename to sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationStatus.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationToken.java b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/providers/openid/OpenIDAuthenticationToken.java
rename to sandbox/openid/src/main/java/org/springframework/security/providers/openid/OpenIDAuthenticationToken.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/providers/openid/package.html b/sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/providers/openid/package.html
rename to sandbox/openid/src/main/java/org/springframework/security/providers/openid/package.html
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConstants.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConstants.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConstants.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumer.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumer.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumerException.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDConsumerException.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDConsumerException.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDLoginInitiationServlet.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDLoginInitiationServlet.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDLoginInitiationServlet.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilter.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilter.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilter.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationProcessingFilter.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationProcessingFilter.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationProcessingFilter.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationRequiredException.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/OpenIdAuthenticationRequiredException.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/OpenIdAuthenticationRequiredException.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/JanRainOpenIDConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/JanRainOpenIDConsumer.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/JanRainOpenIDConsumer.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/OpenId4JavaConsumer.java b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/OpenId4JavaConsumer.java
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/OpenId4JavaConsumer.java
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/package.html b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/consumers/package.html
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/consumers/package.html
diff --git a/sandbox/openid/src/main/java/org/acegisecurity/ui/openid/package.html b/sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html
similarity index 100%
rename from sandbox/openid/src/main/java/org/acegisecurity/ui/openid/package.html
rename to sandbox/openid/src/main/java/org/springframework/security/ui/openid/package.html
diff --git a/sandbox/openid/src/test/java/org/acegisecurity/providers/openid/MockAuthoritiesPopulator.java b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/acegisecurity/providers/openid/MockAuthoritiesPopulator.java
rename to sandbox/openid/src/test/java/org/springframework/security/providers/openid/MockAuthoritiesPopulator.java
diff --git a/sandbox/openid/src/test/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProviderTests.java b/sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/acegisecurity/providers/openid/OpenIDAuthenticationProviderTests.java
rename to sandbox/openid/src/test/java/org/springframework/security/providers/openid/OpenIDAuthenticationProviderTests.java
diff --git a/sandbox/openid/src/test/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilterTests.java b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/acegisecurity/ui/openid/OpenIDResponseProcessingFilterTests.java
rename to sandbox/openid/src/test/java/org/springframework/security/ui/openid/OpenIDResponseProcessingFilterTests.java
diff --git a/sandbox/openid/src/test/java/org/acegisecurity/ui/openid/consumers/MockOpenIDConsumer.java b/sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
similarity index 100%
rename from sandbox/openid/src/test/java/org/acegisecurity/ui/openid/consumers/MockOpenIDConsumer.java
rename to sandbox/openid/src/test/java/org/springframework/security/ui/openid/consumers/MockOpenIDConsumer.java
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index 1038f6faae..fd1ae6866c 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -4,17 +4,17 @@
     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.acegisecurity</groupId>
-    <artifactId>acegi-security-sandbox</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-sandbox</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-sandbox-other</artifactId>
-  <name>Acegi Security System for Spring - Sandbox other</name>
-  <description>Acegi Security System for Spring Miscellaneus sandbox utilities</description>
+  <artifactId>spring-security-sandbox-other</artifactId>
+  <name>Spring Security - Sandbox other</name>
+  <description>Spring Security Miscellaneus sandbox utilities</description>
   <dependencies>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/AccountLockedException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/AccountLockedException.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/AccountLockedException.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/OracleIDPasswordPolicyControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/OracleIDPasswordPolicyControl.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/OracleIDPasswordPolicyControl.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordExpiredException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordExpiredException.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordExpiredException.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordInHistoryException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordInHistoryException.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordInHistoryException.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControl.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControlFactory.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyControlFactory.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyException.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyException.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControl.java b/sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControl.java
rename to sandbox/other/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
diff --git a/sandbox/other/src/main/java/org/acegisecurity/providers/ldap/authenticator/OracleIDBindAuthenticator.java b/sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
similarity index 100%
rename from sandbox/other/src/main/java/org/acegisecurity/providers/ldap/authenticator/OracleIDBindAuthenticator.java
rename to sandbox/other/src/main/java/org/springframework/security/providers/ldap/authenticator/OracleIDBindAuthenticator.java
diff --git a/sandbox/other/src/test/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControlTests.java b/sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
similarity index 100%
rename from sandbox/other/src/test/java/org/acegisecurity/ldap/ppolicy/PasswordPolicyResponseControlTests.java
rename to sandbox/other/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index cb4f7b7f31..8e910021b1 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -2,12 +2,12 @@
 <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.acegisecurity</groupId>
-    <artifactId>acegi-security-parent</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-parent</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-sandbox</artifactId>
-  <name>Acegi Security System for Spring - Sandbox</name>
+  <artifactId>spring-security-sandbox</artifactId>
+  <name>Spring Security - Sandbox</name>
   <packaging>pom</packaging>
 
   <scm>
@@ -25,8 +25,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
diff --git a/sandbox/spring-security-config/src/test/resources/log4j.properties b/sandbox/spring-security-config/src/test/resources/log4j.properties
index 682b56dad8..ff57f6fee2 100644
--- a/sandbox/spring-security-config/src/test/resources/log4j.properties
+++ b/sandbox/spring-security-config/src/test/resources/log4j.properties
@@ -8,5 +8,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
 
-log4j.category.org.acegisecurity=DEBUG
+log4j.category.org.springframework.security=DEBUG
 log4j.category.org.springframework=INFO
\ No newline at end of file
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index 2a732870a9..bac59caaf6 100644
--- a/sandbox/webwork/pom.xml
+++ b/sandbox/webwork/pom.xml
@@ -1,12 +1,12 @@
 <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.acegisecurity</groupId>
-    <artifactId>acegi-security-sandbox</artifactId>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-sandbox</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
-  <artifactId>acegi-security-webwork</artifactId>
-  <name>Acegi Security System for Spring - Webwork support</name>
+  <artifactId>spring-security-webwork</artifactId>
+  <name>Spring Security - Webwork support</name>
   <description>Acegi Security System for Spring - Support for WebWork 2</description>
   <version>0.3-SNAPSHOT</version>
 
diff --git a/sandbox/webwork/src/main/java/org/acegisecurity/webwork/AcegiDispatcherUtils.java b/sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
similarity index 100%
rename from sandbox/webwork/src/main/java/org/acegisecurity/webwork/AcegiDispatcherUtils.java
rename to sandbox/webwork/src/main/java/org/springframework/security/webwork/AcegiDispatcherUtils.java
diff --git a/sandbox/webwork/src/main/java/org/acegisecurity/webwork/FilterDispatcher.java b/sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java
similarity index 100%
rename from sandbox/webwork/src/main/java/org/acegisecurity/webwork/FilterDispatcher.java
rename to sandbox/webwork/src/main/java/org/springframework/security/webwork/FilterDispatcher.java