diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
index d67d9550cf4..15b1a41fc28 100644
--- a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
+++ b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
@@ -61,7 +61,7 @@ class OC4JClassLoaderAdapter {
 	public void addTransformer(ClassFileTransformer transformer) {
 		Assert.notNull(transformer, "ClassFileTransformer must not be null");
 		try {
-			OC4JClassPreProcessorAdapter adapter = new OC4JClassPreProcessorAdapter(transformer);
+			OC4JClassPreprocessorAdapter adapter = new OC4JClassPreprocessorAdapter(transformer);
 			Object adapterInstance = Proxy.newProxyInstance(this.processorClass.getClassLoader(),
 					new Class[] { this.processorClass }, adapter);
 			this.addTransformer.invoke(null, new Object[] { this.classLoader, adapterInstance });
diff --git a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
index 0ba3179060e..2948b691e00 100644
--- a/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
+++ b/org.springframework.context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
@@ -30,16 +30,16 @@ import java.security.ProtectionDomain;
  * 
  * @author Costin Leau
  */
-class OC4JClassPreProcessorAdapter implements InvocationHandler {
+class OC4JClassPreprocessorAdapter implements InvocationHandler {
 
 	private final ClassFileTransformer transformer;
 
 	/**
-	 * Creates a new {@link OC4JClassPreProcessorAdapter}.
+	 * Creates a new {@link OC4JClassPreprocessorAdapter}.
 	 * @param transformer the {@link ClassFileTransformer} to be adapted (must
 	 * not be <code>null</code>)
 	 */
-	public OC4JClassPreProcessorAdapter(ClassFileTransformer transformer) {
+	public OC4JClassPreprocessorAdapter(ClassFileTransformer transformer) {
 		this.transformer = transformer;
 	}
 
diff --git a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
index ea5ad9ed91f..6e20dbd6379 100644
--- a/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapterTests.java
@@ -16,16 +16,19 @@
 
 package org.springframework.instrument.classloading.oc4j;
 
-import static org.easymock.EasyMock.*;
 import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertNotNull;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 
-import org.easymock.AbstractMatcher;
-import org.easymock.MockControl;
 import org.junit.Test;
 
 /**
@@ -59,5 +62,4 @@ public final class OC4JClassPreprocessorAdapterTests {
 	public void testCtorWithNullClassFileTransformer() {
 		new OC4JClassPreprocessorAdapter(null);
 	}
-
 }