diff --git a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStandard.java b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStandard.java
index 7402053f9062b052cda7dff15647b2fa6a02a844..f004374a86437e002347e3dadc9835c162b84ec7 100644
--- a/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStandard.java
+++ b/gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStandard.java
@@ -6,9 +6,8 @@ import net.ihe.gazelle.common.filter.hql.HQLQueryBuilder;
 import net.ihe.gazelle.common.filter.hql.HQLRestrictions;
 import net.ihe.gazelle.common.filter.hql.HQLSafePath;
 import net.ihe.gazelle.proxy.model.message.AbstractMessage;
-import net.ihe.gazelle.proxy.model.message.AbstractMessageHQL;
-import net.ihe.gazelle.proxy.model.message.DicomMessage;
-import net.ihe.gazelle.proxy.model.message.DicomMessageHQL;
+import net.ihe.gazelle.proxy.model.message.AbstractMessageQuery;
+import net.ihe.gazelle.proxy.model.message.DicomMessageQuery;
 import net.ihe.gazelle.proxy.netty.ChannelType;
 import net.ihe.gazelle.proxy.netty.channel.ProxySide;
 
@@ -161,30 +160,30 @@ public class MessageFilterStandard<T extends AbstractMessage> implements Message
 	public void appendFilters(HQLQueryBuilder<T> criteria) {
 		criteria.addRestriction(HQLRestrictions.eq("class", getMessageType().getDiscriminator()));
 
-		AbstractMessageHQL abstractMessageHQL = new AbstractMessageHQL(criteria);
-		addEq(abstractMessageHQL.fromIP(), StringUtils.trimToNull(initiatorIP));
-		addEq(abstractMessageHQL.localPort(), initiatorPort);
+		AbstractMessageQuery abstractMessageQuery = new AbstractMessageQuery(criteria);
+		addEq(abstractMessageQuery.fromIP(), StringUtils.trimToNull(initiatorIP));
+		addEq(abstractMessageQuery.localPort(), initiatorPort);
 
-		addEq(abstractMessageHQL.proxyPort(), proxyPort);
+		addEq(abstractMessageQuery.proxyPort(), proxyPort);
 
-		addEq(abstractMessageHQL.toIP(), StringUtils.trimToNull(responderIP));
-		addEq(abstractMessageHQL.remotePort(), responderPort);
+		addEq(abstractMessageQuery.toIP(), StringUtils.trimToNull(responderIP));
+		addEq(abstractMessageQuery.remotePort(), responderPort);
 
-		addEq(abstractMessageHQL.requestChannelId(), connectionId);
-		addEq(abstractMessageHQL.proxySide(), proxySide);
+		addEq(abstractMessageQuery.requestChannelId(), connectionId);
+		addEq(abstractMessageQuery.proxySide(), proxySide);
 
 		if (dateFrom != null) {
-			abstractMessageHQL.dateReceived().ge(dateFrom);
+			abstractMessageQuery.dateReceived().ge(dateFrom);
 		}
 		if (dateTo != null) {
-			abstractMessageHQL.dateReceived().le(dateFrom);
+			abstractMessageQuery.dateReceived().le(dateFrom);
 		}
 
 		if (messageType == ChannelType.DICOM) {
-			DicomMessageHQL dicomMessageHQL = new DicomMessageHQL(criteria);
-			addEq(dicomMessageHQL.affectedSopClassUID(), dicomAffectedSopClassUID);
-			addEq(dicomMessageHQL.requestedSopClassUID(), dicomRequestedSopClassUID);
-			addEq(dicomMessageHQL.commandField(), dicomCommandField);
+			DicomMessageQuery dicomMessageQuery = new DicomMessageQuery(criteria);
+			addEq(dicomMessageQuery.affectedSopClassUID(), dicomAffectedSopClassUID);
+			addEq(dicomMessageQuery.requestedSopClassUID(), dicomRequestedSopClassUID);
+			addEq(dicomMessageQuery.commandField(), dicomCommandField);
 		}
 	}
 
diff --git a/pom.xml b/pom.xml
index 1a9f2b80c6b7a5b8b85463fc7e498ebe9efe378f..7bfaa026f558ffa1e31db7a13a0a1bb22cec6bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.ihe.gazelle.maven</groupId>
 		<artifactId>gazelle-seam</artifactId>
-		<version>1.51</version>
+		<version>1.52</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>