diff --git a/src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java b/src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java
index d6cdd990a..15a6ec76d 100644
--- a/src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java
+++ b/src/main/java/com/nhn/pinpoint/collector/dao/hbase/HbaseApplicationMapStatisticsCallerDao.java
@@ -75,15 +75,15 @@ public class HbaseApplicationMapStatisticsCallerDao implements ApplicationMapSta
         // make row key. rowkey는 나.
 		final long acceptedTime = acceptedTimeService.getAcceptedTime();
 		final long rowTimeSlot = TimeSlot.getStatisticsRowSlot(acceptedTime);
-        final RowKey calleeRowKey = new CallRowKey(callerApplicationName, callerServiceType, rowTimeSlot);
+        final RowKey callerRowKey = new CallRowKey(callerApplicationName, callerServiceType, rowTimeSlot);
 
         final short callerSlotNumber = ApplicationMapStatisticsUtils.getSlotNumber(calleeServiceType, elapsed, isError);
         final ColumnName callerColumnName = new CallColumnName(calleeServiceType, calleeApplicationName, calleeHost, callerSlotNumber);
 		if (useBulk) {
-            RowInfo rowInfo = new DefaultRowInfo(calleeRowKey, callerColumnName);
+            RowInfo rowInfo = new DefaultRowInfo(callerRowKey, callerColumnName);
             this.counter.increment(rowInfo, 1L);
 		} else {
-            final byte[] rowKey = calleeRowKey.getRowKey();
+            final byte[] rowKey = callerRowKey.getRowKey();
             // column name은 나를 호출한 app
             byte[] columnName = callerColumnName.getColumnName();
             increment(rowKey, columnName, 1L);
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
index 19965bf23..714e100fe 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanChunkHandler.java
@@ -49,15 +49,15 @@ public class SpanChunkHandler implements SimpleHandler {
 				logger.debug("SpanChunk Size:{}", spanEventList.size());
 				// TODO 껀바이 껀인데. 나중에 뭔가 한번에 업데이트 치는걸로 변경해야 될듯.
 				for (TSpanEvent spanEvent : spanEventList) {
-					ServiceType serviceType = ServiceType.findServiceType(spanEvent.getServiceType());
+					final ServiceType serviceType = ServiceType.findServiceType(spanEvent.getServiceType());
 
 					if (!serviceType.isRecordStatistics()) {
 						continue;
 					}
 
 					// if terminal update statistics
-					int elapsed = spanEvent.getEndElapsed();
-					boolean hasException = SpanEventUtils.hasException(spanEvent);
+					final int elapsed = spanEvent.getEndElapsed();
+					final boolean hasException = SpanEventUtils.hasException(spanEvent);
 
 					/**
 					 * 통계정보에 기반한 서버맵을 그리기 위한 정보 저장.
@@ -66,7 +66,7 @@ public class SpanChunkHandler implements SimpleHandler {
 					statisticsHandler.updateCaller(spanEvent.getDestinationId(), serviceType.getCode(), spanChunk.getApplicationName(), spanChunk.getServiceType(), spanEvent.getEndPoint(), elapsed, hasException);
 
 					// 나를 호출한 정보 저장 (spanevent를 호출한 span)
-					statisticsHandler.updateCallee(spanChunk.getApplicationName(), spanChunk.getServiceType(), spanEvent.getDestinationId(), spanEvent.getServiceType(), spanChunk.getEndPoint(), elapsed, hasException);
+					statisticsHandler.updateCallee(spanEvent.getDestinationId(), spanEvent.getServiceType(), spanChunk.getApplicationName(), spanChunk.getServiceType(), spanChunk.getEndPoint(), elapsed, hasException);
 				}
 			}
 		} catch (Exception e) {
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
index 72311ef6f..ac52e2fe6 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/SpanHandler.java
@@ -68,8 +68,9 @@ public class SpanHandler implements SimpleHandler {
         int bugCheck = 0;
         if (span.getParentSpanId() == -1) {
             // FIXME 테스트용. host값에 agentId를 입력.
+            // user를 생성하는 부분
             statisticsHandler.updateCaller(span.getApplicationName(), span.getServiceType(), span.getApplicationName(), ServiceType.USER.getCode(), span.getAgentId(), span.getElapsed(), isError);
-            statisticsHandler.updateCallee(span.getApplicationName(), ServiceType.USER.getCode(), span.getApplicationName(), span.getServiceType(), span.getAgentId(), span.getElapsed(), isError);
+            statisticsHandler.updateCallee(span.getApplicationName(), span.getServiceType(), span.getApplicationName(), ServiceType.USER.getCode(), span.getAgentId(), span.getElapsed(), isError);
             bugCheck++;
         }
 
@@ -80,7 +81,7 @@ public class SpanHandler implements SimpleHandler {
             logger.debug("Received parent application name. {}", span.getParentApplicationName());
             // TODO 원래는 부모의 serviceType을 알아야 한다.
             // 여기에서는 그냥 부모는 모두 TOMCAT이라 가정하고 테스트.
-            statisticsHandler.updateCallee(span.getParentApplicationName(), span.getParentApplicationType(), span.getApplicationName(), span.getServiceType(), span.getAgentId(), span.getElapsed(), isError);
+            statisticsHandler.updateCallee(span.getApplicationName(), span.getServiceType(), span.getParentApplicationName(), span.getParentApplicationType(), span.getAgentId(), span.getElapsed(), isError);
             // statisticsHandler.updateCallee(span.getParentApplicationName(), span.getParentApplicationType(), span.getApplicationName(), span.getServiceType(), span.getEndPoint(), span.getElapsed(), span.getErr() > 0);
             bugCheck++;
         }
@@ -114,7 +115,7 @@ public class SpanHandler implements SimpleHandler {
             statisticsHandler.updateCaller(spanEvent.getDestinationId(), serviceType.getCode(), span.getApplicationName(), span.getServiceType(), spanEvent.getEndPoint(), elapsed, hasException);
 
             // 나를 호출한 정보 저장 (spanevent를 호출한 span)
-            statisticsHandler.updateCallee(span.getApplicationName(), span.getServiceType(), spanEvent.getDestinationId(), spanEvent.getServiceType(), span.getEndPoint(), elapsed, hasException);
+            statisticsHandler.updateCallee(spanEvent.getDestinationId(), spanEvent.getServiceType(), span.getApplicationName(), span.getServiceType(), span.getEndPoint(), elapsed, hasException);
         }
     }
 
diff --git a/src/main/java/com/nhn/pinpoint/collector/handler/StatisticsHandler.java b/src/main/java/com/nhn/pinpoint/collector/handler/StatisticsHandler.java
index a34aba53b..7438aec06 100644
--- a/src/main/java/com/nhn/pinpoint/collector/handler/StatisticsHandler.java
+++ b/src/main/java/com/nhn/pinpoint/collector/handler/StatisticsHandler.java
@@ -23,7 +23,7 @@ public class StatisticsHandler {
 		applicationMapStatisticsCallerDao.update(calleeApplicationName, calleeServiceType, callerApplicationName, callerServiceType, calleeHost, elapsed, isError);
 	}
 
-	public void updateCallee(String callerApplicationName, short callerServiceType, String calleeApplicationName, short calleeServiceType, String callerHost, int elapsed, boolean isError) {
+	public void updateCallee(String calleeApplicationName, short calleeServiceType, String callerApplicationName, short callerServiceType, String callerHost, int elapsed, boolean isError) {
 		applicationMapStatisticsCalleeDao.update(calleeApplicationName, calleeServiceType, callerApplicationName, callerServiceType, callerHost, elapsed, isError);
 	}
 }