diff --git a/org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java b/org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java
index a5515b61c5c..0c0f1e34b30 100644
--- a/org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java
+++ b/org.springframework.context/src/main/java/org/springframework/mapping/support/MapperConverter.java
@@ -46,7 +46,7 @@ public class MapperConverter implements GenericConverter {
 		if (source == null) {
 			return null;
 		}
-		if (SpelMappingContextHolder.contains(source)) {
+		if (MappingContextHolder.contains(source)) {
 			return source;
 		}
 		if (sourceType.isAssignableTo(targetType) && isCopyByReference(sourceType, targetType)) {
diff --git a/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMappingContextHolder.java b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
similarity index 97%
rename from org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMappingContextHolder.java
rename to org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
index 6c3556e25ce..45915fed5e1 100644
--- a/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMappingContextHolder.java
+++ b/org.springframework.context/src/main/java/org/springframework/mapping/support/MappingContextHolder.java
@@ -4,7 +4,7 @@ import java.util.Stack;
 
 import org.springframework.core.NamedThreadLocal;
 
-class SpelMappingContextHolder {
+class MappingContextHolder {
 
 	private static final ThreadLocal<Stack<Object>> mappingContextHolder = new NamedThreadLocal<Stack<Object>>(
 			"Mapping context");
diff --git a/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java b/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java
index 3d9c772803a..1f5690d2169 100644
--- a/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java
+++ b/org.springframework.context/src/main/java/org/springframework/mapping/support/SpelMapper.java
@@ -97,7 +97,7 @@ public class SpelMapper implements Mapper<Object, Object> {
 
 	public Object map(Object source, Object target) {
 		try {
-			SpelMappingContextHolder.push(source);
+			MappingContextHolder.push(source);
 			EvaluationContext sourceContext = getEvaluationContext(source);
 			EvaluationContext targetContext = getEvaluationContext(target);
 			List<MappingFailure> failures = new LinkedList<MappingFailure>();
@@ -113,7 +113,7 @@ public class SpelMapper implements Mapper<Object, Object> {
 			}
 			return target;
 		} finally {
-			SpelMappingContextHolder.pop();
+			MappingContextHolder.pop();
 		}
 	}
 
@@ -124,7 +124,7 @@ public class SpelMapper implements Mapper<Object, Object> {
 	private void doMap(SpelMapping mapping, EvaluationContext sourceContext, EvaluationContext targetContext,
 			List<MappingFailure> failures) {
 		if (logger.isDebugEnabled()) {
-			logger.debug(SpelMappingContextHolder.getLevel() + mapping);
+			logger.debug(MappingContextHolder.getLevel() + mapping);
 		}
 		mapping.map(sourceContext, targetContext, failures);
 	}