diff --git a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHook.java b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHook.java
similarity index 96%
rename from publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHook.java
rename to publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHook.java
index efc10fe..bd40a1e 100644
--- a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHook.java
+++ b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHook.java
@@ -34,9 +34,9 @@
 import com.redhat.lightblue.query.Projection;
 import com.redhat.lightblue.util.Error;
 
-public class PublishHook implements CRUDHook, LightblueFactoryAware {
+public class EsbHook implements CRUDHook, LightblueFactoryAware {
 
-    private final Logger LOGGER = LoggerFactory.getLogger(PublishHook.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(EsbHook.class);
 
     public static final String HOOK_NAME = "publishHook";
     public static final String ENTITY_NAME = "esbEvents";
@@ -56,11 +56,11 @@ public void setLightblueFactory(LightblueFactory factory) {
 
     @Override
     public void processHook(EntityMetadata entityMetadata, HookConfiguration hookConfiguration, List<HookDoc> docs) {
-        if (!(hookConfiguration instanceof PublishHookConfiguration)) {
+        if (!(hookConfiguration instanceof EsbHookConfiguration)) {
             throw new IllegalArgumentException("Only instances of PublishHookConfiguration are supported.");
         }
 
-        PublishHookConfiguration publishHookConfiguration = (PublishHookConfiguration) hookConfiguration;
+        EsbHookConfiguration publishHookConfiguration = (EsbHookConfiguration) hookConfiguration;
 
         for (HookDoc doc : docs) {
 
diff --git a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfiguration.java b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfiguration.java
similarity index 75%
rename from publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfiguration.java
rename to publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfiguration.java
index 3fb6108..9d1be70 100644
--- a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfiguration.java
+++ b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfiguration.java
@@ -8,13 +8,13 @@
  *
  * @author vrjain
  */
-public class PublishHookConfiguration implements HookConfiguration {
+public class EsbHookConfiguration implements HookConfiguration {
 
     private static final long serialVersionUID = -2297815875083279355L;
 
     private final List<EventConfiguration> eventConfigurations;
 
-    public PublishHookConfiguration(List<EventConfiguration> eventConfigurations) {
+    public EsbHookConfiguration(List<EventConfiguration> eventConfigurations) {
         this.eventConfigurations = eventConfigurations;
     }
 
diff --git a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfigurationParser.java b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfigurationParser.java
similarity index 93%
rename from publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfigurationParser.java
rename to publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfigurationParser.java
index fe5a66e..aa65ef0 100644
--- a/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/PublishHookConfigurationParser.java
+++ b/publish-hook/src/main/java/com/redhat/lightblue/hook/publish/EsbHookConfigurationParser.java
@@ -10,7 +10,7 @@
 import com.redhat.lightblue.metadata.parser.MetadataParser;
 import com.redhat.lightblue.query.Projection;
 
-public class PublishHookConfigurationParser<T> implements HookConfigurationParser<T> {
+public class EsbHookConfigurationParser<T> implements HookConfigurationParser<T> {
 
     public static final String PROPERTY_EVENT_CONFIGURATIONS = "eventConfigurations";
     public static final String PROPERTY_ROOT_ENTITY_NAME = "esbRootEntityName";
@@ -25,18 +25,18 @@ public class PublishHookConfigurationParser<T> implements HookConfigurationParse
 
     @Override
     public String getName() {
-        return PublishHook.HOOK_NAME;
+        return EsbHook.HOOK_NAME;
     }
 
     @Override
     public CRUDHook getCRUDHook() {
-        return new PublishHook();
+        return new EsbHook();
     }
 
     @Override
     public void convert(MetadataParser<T> p, T emptyNode, HookConfiguration object) {
-        if (object instanceof PublishHookConfiguration) {
-            PublishHookConfiguration config = (PublishHookConfiguration) object;
+        if (object instanceof EsbHookConfiguration) {
+            EsbHookConfiguration config = (EsbHookConfiguration) object;
 
             Object eventConfigurationArray = p.newArrayField(emptyNode, PROPERTY_EVENT_CONFIGURATIONS);
             for (EventConfiguration eventConfiguration : config.getEventConfigurations()) {
@@ -98,6 +98,6 @@ public HookConfiguration parse(String name, MetadataParser<T> parser, T node) {
             eventConfigurations.add(conf);
         }
 
-        return new PublishHookConfiguration(eventConfigurations);
+        return new EsbHookConfiguration(eventConfigurations);
     }
 }
diff --git a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BasePublishHookTest.java b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BaseEsbHookTest.java
similarity index 96%
rename from publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BasePublishHookTest.java
rename to publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BaseEsbHookTest.java
index 6e96575..d6a6015 100644
--- a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BasePublishHookTest.java
+++ b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/BaseEsbHookTest.java
@@ -19,7 +19,7 @@
 import com.redhat.lightblue.mongo.test.AbstractMongoCRUDTestController;
 import com.redhat.lightblue.test.FakeClientIdentification;
 
-public abstract class BasePublishHookTest extends AbstractMongoCRUDTestController {
+public abstract class BaseEsbHookTest extends AbstractMongoCRUDTestController {
 
     protected static final String ESB_EVENTS_VERSION = "0.0.1-SNAPSHOT";
     protected static final String COUNTRY_VERSION = "0.1.0-SNAPSHOT";
@@ -29,7 +29,7 @@ public static void preparePublishHookDatasources() {
         System.setProperty("mongo.datasource", "mongodata");
     }
 
-    public BasePublishHookTest() throws Exception {
+    public BaseEsbHookTest() throws Exception {
         super();
     }
 
diff --git a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/PublishHookTest.java b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/EsbHookTest.java
similarity index 94%
rename from publish-hook/src/test/java/com/redhat/lightblue/hook/publish/PublishHookTest.java
rename to publish-hook/src/test/java/com/redhat/lightblue/hook/publish/EsbHookTest.java
index 767f537..e496595 100644
--- a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/PublishHookTest.java
+++ b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/EsbHookTest.java
@@ -7,13 +7,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-public class PublishHookTest extends BasePublishHookTest {
+public class EsbHookTest extends BaseEsbHookTest {
 
     private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"123\",\"field\":\"iso2Code\"},{\"value\":\"456\",\"field\":\"iso3Code\"}]";
     private static final String expectedFields = ",\"rootIdentity\":" + expectedIdentityKeys
             + ",\"headers\":[{\"name\":\"test\",\"value\":\"true\"},{\"name\":\"noop\",\"value\":\"false\"}]";
 
-    public PublishHookTest() throws Exception {
+    public EsbHookTest() throws Exception {
         super();
     }
 
diff --git a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityPublishHookTest.java b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityEsbHookTest.java
similarity index 92%
rename from publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityPublishHookTest.java
rename to publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityEsbHookTest.java
index 287294a..fa4737b 100644
--- a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityPublishHookTest.java
+++ b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/FieldIdentityEsbHookTest.java
@@ -7,13 +7,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-public class FieldIdentityPublishHookTest extends BasePublishHookTest {
+public class FieldIdentityEsbHookTest extends BaseEsbHookTest {
 
     private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"swift\",\"field\":\"optionalField.mySpecificField\"}]";
     private static final String expectedFields = ",\"rootIdentity\":[{\"field\":\"_id\"}]"
             + ",\"headers\":[{\"name\":\"test\",\"value\":\"true\"},{\"name\":\"noop\",\"value\":\"false\"}]";
 
-    public FieldIdentityPublishHookTest() throws Exception {
+    public FieldIdentityEsbHookTest() throws Exception {
         super();
     }
 
diff --git a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsPublishHookTest.java b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsEsbHookTest.java
similarity index 91%
rename from publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsPublishHookTest.java
rename to publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsEsbHookTest.java
index b4b7d06..8c10784 100644
--- a/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsPublishHookTest.java
+++ b/publish-hook/src/test/java/com/redhat/lightblue/hook/publish/MinimalConfigurationsEsbHookTest.java
@@ -7,12 +7,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-public class MinimalConfigurationsPublishHookTest extends BasePublishHookTest {
+public class MinimalConfigurationsEsbHookTest extends BaseEsbHookTest {
 
     private static final String expectedIdentityKeys = "[{\"field\":\"_id\"},{\"value\":\"123\",\"field\":\"iso2Code\"},{\"value\":\"456\",\"field\":\"iso3Code\"}]";
     private static final String expectedFields = ",\"rootIdentity#\":0,\"headers#\":0";
 
-    public MinimalConfigurationsPublishHookTest() throws Exception {
+    public MinimalConfigurationsEsbHookTest() throws Exception {
         super();
     }
 
diff --git a/publish-hook/src/test/resources/mongo-lightblue-metadata.json b/publish-hook/src/test/resources/mongo-lightblue-metadata.json
index ffc7e4e..3750cf8 100644
--- a/publish-hook/src/test/resources/mongo-lightblue-metadata.json
+++ b/publish-hook/src/test/resources/mongo-lightblue-metadata.json
@@ -3,6 +3,6 @@
     "dataSource" : "${mongo.datasource}",
     "collection": "metadata",
     "hookConfigurationParsers": [
-        "com.redhat.lightblue.hook.publish.PublishHookConfigurationParser"
+        "com.redhat.lightblue.hook.publish.EsbHookConfigurationParser"
     ]
 }