diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java
index dcc41188..410a2a80 100644
--- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java
+++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.data.gemfire.CacheFactoryBean;
-import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect;
+import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperRegionAspect;
 import org.springframework.geode.cache.SimpleCacheResolver;
 import org.springframework.geode.data.json.JsonCacheDataImporterExporter;
 import org.springframework.lang.NonNull;
@@ -54,7 +54,7 @@ import org.springframework.lang.NonNull;
  * @see org.springframework.core.env.Environment
  * @see org.springframework.core.type.AnnotatedTypeMetadata
  * @see org.springframework.data.gemfire.CacheFactoryBean
- * @see org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect
+ * @see PdxInstanceWrapperRegionAspect
  * @see org.springframework.geode.cache.SimpleCacheResolver
  * @see org.springframework.geode.data.json.JsonCacheDataImporterExporter
  * @since 1.3.0
@@ -76,8 +76,8 @@ public class DataImportExportAutoConfiguration {
 
 	@Bean
 	@Conditional(RegionAdviceConditions.class)
-	PdxInstanceWrapperAspect pdxInstanceWrapperAspect() {
-		return new PdxInstanceWrapperAspect();
+	PdxInstanceWrapperRegionAspect pdxInstanceWrapperAspect() {
+		return new PdxInstanceWrapperRegionAspect();
 	}
 
 	static class RegionAdviceConditions extends AnyNestedCondition {
diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperAspect.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java
similarity index 93%
rename from spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperAspect.java
rename to spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java
index 99c5db94..d03925eb 100644
--- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperAspect.java
+++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java
@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 
 import org.apache.geode.cache.CacheStatistics;
 import org.apache.geode.cache.Region;
+import org.apache.geode.pdx.PdxInstance;
 
 import org.springframework.geode.pdx.PdxInstanceWrapper;
 import org.springframework.lang.NonNull;
@@ -35,8 +36,13 @@ import org.aspectj.lang.annotation.Pointcut;
 /**
  * A Spring, AspectJ {@link Aspect} advising GemFire/Geode cache {@link Region} data access operations.
  *
+ * Specifically, this {@link Aspect} wraps all {@link PdxInstance} objects returned from cache {@link Region}
+ * read data access operations inside a new instance of {@link PdxInstanceWrapper}.
+ *
  * @author John Blum
+ * @see java.util.Map
  * @see org.apache.geode.cache.Region
+ * @see org.apache.geode.pdx.PdxInstance
  * @see org.aspectj.lang.annotation.Around
  * @see org.aspectj.lang.annotation.Aspect
  * @see org.aspectj.lang.annotation.Pointcut
@@ -45,7 +51,7 @@ import org.aspectj.lang.annotation.Pointcut;
  */
 @Aspect
 @SuppressWarnings("unused")
-public class PdxInstanceWrapperAspect {
+public class PdxInstanceWrapperRegionAspect {
 
 	private static Collection<?> asCollection(Object value) {
 		return value instanceof Collection ? (Collection<?>) value : Collections.emptyList();
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperAspectUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java
similarity index 96%
rename from spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperAspectUnitTests.java
rename to spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java
index 5f016d7e..4a9f7052 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperAspectUnitTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/pdx/PdxInstanceWrapperRegionAspectUnitTests.java
@@ -37,14 +37,14 @@ import org.apache.geode.cache.CacheStatistics;
 import org.apache.geode.cache.Region;
 import org.apache.geode.pdx.PdxInstance;
 
-import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect;
-import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect.RegionEntryWrapper;
+import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperRegionAspect;
+import org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperRegionAspect.RegionEntryWrapper;
 import org.springframework.geode.pdx.PdxInstanceWrapper;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 
 /**
- * Unit Tests for {@link PdxInstanceWrapperAspect}
+ * Unit Tests for {@link PdxInstanceWrapperRegionAspect}
  *
  * @author John Blum
  * @see java.util.Map
@@ -52,14 +52,14 @@ import org.aspectj.lang.ProceedingJoinPoint;
  * @see org.mockito.Mockito
  * @see org.apache.geode.cache.Region
  * @see org.apache.geode.pdx.PdxInstance
- * @see org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect
- * @see org.springframework.geode.boot.autoconfigure.support.PdxInstanceWrapperAspect.RegionEntryWrapper
+ * @see PdxInstanceWrapperRegionAspect
+ * @see PdxInstanceWrapperRegionAspect.RegionEntryWrapper
  * @see org.springframework.geode.pdx.PdxInstanceWrapper
  * @since 1.3.0
  */
-public class PdxInstanceWrapperAspectUnitTests {
+public class PdxInstanceWrapperRegionAspectUnitTests {
 
-	private PdxInstanceWrapperAspect aspect = new PdxInstanceWrapperAspect();
+	private PdxInstanceWrapperRegionAspect aspect = new PdxInstanceWrapperRegionAspect();
 
 	@Test
 	public void regionGetAdviceWrapsPdx() throws Throwable {