diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/heatmap/service/HeatmapService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/heatmap/service/HeatmapService.java
index 2633b9f76fc9..a7f48e5dc43c 100644
--- a/collector/src/main/java/com/navercorp/pinpoint/collector/heatmap/service/HeatmapService.java
+++ b/collector/src/main/java/com/navercorp/pinpoint/collector/heatmap/service/HeatmapService.java
@@ -43,7 +43,7 @@ public void insertSpanChunk(SpanChunkBo spanChunkBo) {
 
     @Override
     public void insertSpan(SpanBo spanBo) {
-        HeatmapStat heatmapStat = new HeatmapStat(spanBo.getApplicationId(), spanBo.getAgentId(), spanBo.getCollectorAcceptTime(), spanBo.getElapsed(), spanBo.getErrCode());
+        HeatmapStat heatmapStat = new HeatmapStat(spanBo.getApplicationName(), spanBo.getAgentId(), spanBo.getCollectorAcceptTime(), spanBo.getElapsed(), spanBo.getErrCode());
         heatmapDao.insert(heatmapStat);
     }
 }
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java b/collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java
index 842daf42088c..ef135755dcc1 100644
--- a/collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java
+++ b/collector/src/main/java/com/navercorp/pinpoint/collector/service/HbaseTraceService.java
@@ -22,6 +22,7 @@
 import com.navercorp.pinpoint.collector.dao.TraceDao;
 import com.navercorp.pinpoint.collector.event.SpanStorePublisher;
 import com.navercorp.pinpoint.common.profiler.logging.ThrottledLogger;
+import com.navercorp.pinpoint.common.server.bo.BasicSpan;
 import com.navercorp.pinpoint.common.server.bo.SpanBo;
 import com.navercorp.pinpoint.common.server.bo.SpanChunkBo;
 import com.navercorp.pinpoint.common.server.bo.SpanEventBo;
@@ -96,8 +97,8 @@ public void insertSpanChunk(@Valid final SpanChunkBo spanChunkBo) {
         publisher.publishEvent(event, true);
     }
 
-    private ServiceType getApplicationServiceType(SpanChunkBo spanChunk) {
-        final int applicationServiceTypeCode = spanChunk.getApplicationServiceType();
+    private ServiceType getApplicationServiceType(BasicSpan basicSpan) {
+        final int applicationServiceTypeCode = basicSpan.getApplicationServiceType();
         return registry.findServiceType(applicationServiceTypeCode);
     }
 
@@ -158,12 +159,6 @@ private void insertAcceptorHost(SpanBo span) {
         }
     }
 
-    private ServiceType getApplicationServiceType(SpanBo span) {
-        // Check if applicationServiceType is set. If not, use span's service type.
-        final int applicationServiceTypeCode = span.getApplicationServiceType();
-        return registry.findServiceType(applicationServiceTypeCode);
-    }
-
     private void insertSpanStat(SpanBo span) {
         final ServiceType applicationServiceType = getApplicationServiceType(span);
         final ServiceType spanServiceType = registry.findServiceType(span.getServiceType());
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/BasicSpan.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/BasicSpan.java
index 8f1fef172390..ff32231068e4 100644
--- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/BasicSpan.java
+++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/BasicSpan.java
@@ -55,6 +55,12 @@ public interface BasicSpan {
     TransactionId getTransactionId();
 //    void setTransactionId(TransactionId transactionId);
 
+    int getApplicationServiceType();
+    void setApplicationServiceType(int applicationServiceType);
+    boolean hasApplicationServiceType();
+
+    long getCollectorAcceptTime();
+    void setCollectorAcceptTime(long collectorAcceptTime);
 
 //    List<SpanEventBo> getSpanEventBoList();
 }
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanBo.java
index 17a0364c0a2a..e077576da4ef 100644
--- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanBo.java
+++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanBo.java
@@ -31,6 +31,8 @@
  */
 public class SpanBo implements Event, BasicSpan {
 
+    private static final int UNDEFINED = ServiceType.UNDEFINED.getCode();
+
     // version 0 means that the type of prefix's size is int
     private byte version = 0;
 
@@ -309,10 +311,12 @@ public void setRemoteAddr(String remoteAddr) {
         this.remoteAddr = remoteAddr;
     }
 
+    @Override
     public long getCollectorAcceptTime() {
         return collectorAcceptTime;
     }
 
+    @Override
     public void setCollectorAcceptTime(long collectorAcceptTime) {
         this.collectorAcceptTime = collectorAcceptTime;
     }
@@ -348,14 +352,17 @@ public void setExceptionClass(String exceptionClass) {
         this.exceptionClass = exceptionClass;
     }
 
+    @Override
     public void setApplicationServiceType(int applicationServiceType) {
         this.applicationServiceType = applicationServiceType;
     }
 
+    @Override
     public boolean hasApplicationServiceType() {
-        return applicationServiceType != 0 && applicationServiceType != ServiceType.UNDEFINED.getCode();
+        return applicationServiceType != 0 && applicationServiceType != UNDEFINED;
     }
 
+    @Override
     public int getApplicationServiceType() {
         if (hasApplicationServiceType()) {
             return this.applicationServiceType;
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanChunkBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanChunkBo.java
index 9b3d03cb5123..a09b6ef43b79 100644
--- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanChunkBo.java
+++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/SpanChunkBo.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.common.profiler.util.TransactionId;
 import com.navercorp.pinpoint.common.server.util.ByteUtils;
 import com.navercorp.pinpoint.common.server.util.StringPrecondition;
+import com.navercorp.pinpoint.common.trace.ServiceType;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.PositiveOrZero;
 
@@ -30,6 +31,8 @@
  */
 public class SpanChunkBo implements BasicSpan {
 
+    private static final int UNDEFINED = ServiceType.UNDEFINED.getCode();
+
     private byte version = 0;
 
     @NotBlank private String agentId;
@@ -147,22 +150,31 @@ public void setEndPoint(String endPoint) {
         this.endPoint = endPoint;
     }
 
+    @Override
     public long getCollectorAcceptTime() {
         return collectorAcceptTime;
     }
 
+    @Override
     public void setCollectorAcceptTime(long collectorAcceptTime) {
         this.collectorAcceptTime = collectorAcceptTime;
     }
 
+    @Override
     public void setApplicationServiceType(int applicationServiceType) {
         this.applicationServiceType  = applicationServiceType;
     }
 
+    @Override
     public int getApplicationServiceType() {
         return this.applicationServiceType;
     }
 
+    @Override
+    public boolean hasApplicationServiceType() {
+        return applicationServiceType != 0 && applicationServiceType != UNDEFINED;
+    }
+
     public List<SpanEventBo> getSpanEventBoList() {
         return spanEventBoList;
     }