diff --git a/server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionComponent.java b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
similarity index 87%
rename from server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionComponent.java
rename to server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
index 29d516611..b429b4e85 100644
--- a/server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionComponent.java
+++ b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionComponent.java
@@ -24,14 +24,14 @@
 @Singleton
 @Component(
         modules = {
-            BlockNodeAppServerInjectionModule.class,
+            BlockNodeAppInjectionModule.class,
             HealthInjectionModule.class,
         })
-public interface BlockNodeAppServerInjectionComponent {
+public interface BlockNodeAppInjectionComponent {
     /**
      * Get the block node app server.
      *
      * @return the block node app server
      */
-    BlockNodeApp getBlockNodeAppServer();
+    BlockNodeApp getBlockNodeApp();
 }
diff --git a/server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionModule.java b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
similarity index 95%
rename from server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionModule.java
rename to server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
index 41a1bd8c7..f69f4de5e 100644
--- a/server/src/main/java/com/hedera/block/server/BlockNodeAppServerInjectionModule.java
+++ b/server/src/main/java/com/hedera/block/server/BlockNodeAppInjectionModule.java
@@ -25,7 +25,7 @@
  * everything should be inside its own modules.
  */
 @Module
-public interface BlockNodeAppServerInjectionModule {
+public interface BlockNodeAppInjectionModule {
 
     /**
      * Binds the service status to the service status implementation.
diff --git a/server/src/main/java/com/hedera/block/server/Server.java b/server/src/main/java/com/hedera/block/server/Server.java
index 0a1bb4282..cd9e07c94 100644
--- a/server/src/main/java/com/hedera/block/server/Server.java
+++ b/server/src/main/java/com/hedera/block/server/Server.java
@@ -36,9 +36,9 @@ public static void main(final String[] args) {
         LOGGER.log(System.Logger.Level.INFO, "Starting BlockNode Server");
 
         @NonNull
-        final BlockNodeAppServerInjectionComponent daggerComponent =
-                DaggerBlockNodeAppServerInjectionComponent.create();
-        @NonNull final BlockNodeApp server = daggerComponent.getBlockNodeAppServer();
+        final BlockNodeAppInjectionComponent daggerComponent =
+                DaggerBlockNodeAppInjectionComponent.create();
+        @NonNull final BlockNodeApp server = daggerComponent.getBlockNodeApp();
 
         try {
             server.startServer();