diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
similarity index 95%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj
rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
index ffdaa6b047..30bf1ab8f6 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj
+++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj
similarity index 95%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj
rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj
index c732d7800b..397cbcda69 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj
+++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import javax.persistence.Entity;
 import org.junit.Test;
diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
similarity index 87%
rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java
rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
index b2efe668d2..d98e75d953 100644
--- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java
+++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
similarity index 91%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java
rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
index 81a37a77f9..12280148c5 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java
+++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import java.rmi.RemoteException;
 
@@ -8,6 +8,8 @@ import junit.framework.Assert;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.mock.staticmock.JUnitStaticEntityMockingControl;
+import org.springframework.mock.staticmock.MockStaticEntityMethods;
 
 //Used because verification failures occur after method returns,
 //so we can't test for them in the test case itself
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java
similarity index 95%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java
rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java
index bfb2ce800b..f409d3c576 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java
+++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import java.rmi.RemoteException;
 
@@ -25,6 +25,8 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.springframework.mock.staticmock.JUnitStaticEntityMockingControl;
+import org.springframework.mock.staticmock.MockStaticEntityMethods;
 import org.springframework.remoting.RemoteAccessException;
 
 
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java
similarity index 59%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java
rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java
index 65f112cd09..c0d82c59c3 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java
+++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 import javax.persistence.Entity;
 
diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
similarity index 98%
rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj
rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
index aadad7ce0f..b911cee1b2 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj
+++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
@@ -1,4 +1,4 @@
-package org.springframework.mock.static_mock;
+package org.springframework.mock.staticmock;
 
 privileged aspect Person_Roo_Entity {