diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
index 3f599466..aa8df4c0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
@@ -46,11 +46,11 @@ public abstract class GemfireUtils extends RegionUtils {
 	private static final String ASYNC_EVENT_QUEUE_ELEMENT_NAME = "async-event-queue";
 	private static final String ASYNC_EVENT_QUEUE_TYPE_NAME = "org.apache.geode.cache.asyncqueue.AsyncEventQueue";
 	private static final String CQ_ELEMENT_NAME = "cq-listener-container";
-	private static final String CQ_TYPE_NAME = "org.apache.geode.cache.query.internal.cq.CqServiceFactoryImpl";
+	private static final String CQ_TYPE_NAME = "org.apache.geode.cache.query.CqQuery";
 	private static final String GATEWAY_RECEIVER_ELEMENT_NAME = "gateway-receiver";
-	private static final String GATEWAY_RECEIVER_TYPE_NAME = "org.apache.geode.internal.cache.wan.GatewayReceiverFactoryImpl";
+	private static final String GATEWAY_RECEIVER_TYPE_NAME = "org.apache.geode.cache.wan.GatewayReceiverFactory";
 	private static final String GATEWAY_SENDER_ELEMENT_NAME = "gateway-sender";
-	private static final String GATEWAY_SENDER_TYPE_NAME = "org.apache.geode.internal.cache.wan.GatewaySenderFactoryImpl";
+	private static final String GATEWAY_SENDER_TYPE_NAME = "org.apache.geode.cache.wan.GatewaySenderFactory";
 
 	public static String apacheGeodeProductName() {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java
index 6030b2a7..90e34f3f 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/xml/ParsingUtils.java
@@ -498,7 +498,7 @@ abstract class ParsingUtils {
 				? String.format("Attribute [%1$s] of element [%2$s]", attributeName, elementName)
 				: String.format("Element [%s]", elementName);
 
-			String message = String.format("%1$s requires Pivotal GemFire version 7 or later. Current version is %2$s.",
+			String message = String.format("%1$s requires VMware Tanzu GemFire version 7 or later. Current version is %2$s.",
 				messagePrefix, GemfireUtils.GEMFIRE_VERSION);
 
 			parserContext.getReaderContext().error(message, null);