diff --git a/service/src/main/java/bio/terra/common/events/topics/EventClient.java b/service/src/main/java/bio/terra/common/events/topics/AbstractEventTopic.java
similarity index 79%
rename from service/src/main/java/bio/terra/common/events/topics/EventClient.java
rename to service/src/main/java/bio/terra/common/events/topics/AbstractEventTopic.java
index 61b65cf..f6c3e04 100644
--- a/service/src/main/java/bio/terra/common/events/topics/EventClient.java
+++ b/service/src/main/java/bio/terra/common/events/topics/AbstractEventTopic.java
@@ -3,11 +3,11 @@
 import bio.terra.common.events.client.PubsubClient;
 
 /** This class is responsible interacting with the PubsubClient (both publish and subscribe). */
-public abstract class EventClient<T extends EventMessage> {
+public abstract class AbstractEventTopic<T extends EventMessage> {
 
   private PubsubClient client;
 
-  public EventClient(PubsubClient client) {
+  public AbstractEventTopic(PubsubClient client) {
     this.client = client;
   }
 
diff --git a/service/src/main/java/bio/terra/common/events/topics/ChartTopic.java b/service/src/main/java/bio/terra/common/events/topics/ChartTopic.java
index 0ed227c..dd32c16 100644
--- a/service/src/main/java/bio/terra/common/events/topics/ChartTopic.java
+++ b/service/src/main/java/bio/terra/common/events/topics/ChartTopic.java
@@ -4,7 +4,7 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ChartTopic extends EventClient<ChartMessage> {
+public class ChartTopic extends AbstractEventTopic<ChartMessage> {
 
   public ChartTopic(PubsubClient pubsubClient) {
     super(pubsubClient);