diff --git a/pom.xml b/pom.xml
index df5d18973..f2e1a55f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,9 +53,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.nhn.hippo</groupId>
-            <artifactId>hippo-commons</artifactId>
-            <version>0.0.2</version>
+            <groupId>com.nhn.pinpoint</groupId>
+            <artifactId>pinpoint-commons</artifactId>
+            <version>0.0.3-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.hadoop</groupId>
diff --git a/src/main/java/com/profiler/DefaultAgent.java b/src/main/java/com/profiler/DefaultAgent.java
index bf2c376c6..adf8566bc 100644
--- a/src/main/java/com/profiler/DefaultAgent.java
+++ b/src/main/java/com/profiler/DefaultAgent.java
@@ -1,9 +1,9 @@
 package com.profiler;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.AgentInfo;
-import com.profiler.common.hbase.HBaseTables;
-import com.profiler.common.mapping.ApiMappingTable;
+import com.nhn.pinpoint.common.hbase.HBaseTables;
+import com.nhn.pinpoint.common.mapping.ApiMappingTable;
 import com.profiler.config.ProfilerConfig;
 import com.profiler.context.BypassStorageFactory;
 import com.profiler.context.DefaultTraceContext;
diff --git a/src/main/java/com/profiler/context/DefaultAsyncTrace.java b/src/main/java/com/profiler/context/DefaultAsyncTrace.java
index 759244402..bd4dd061c 100644
--- a/src/main/java/com/profiler/context/DefaultAsyncTrace.java
+++ b/src/main/java/com/profiler/context/DefaultAsyncTrace.java
@@ -2,8 +2,8 @@ package com.profiler.context;
 
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicInteger;
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
diff --git a/src/main/java/com/profiler/context/DefaultTrace.java b/src/main/java/com/profiler/context/DefaultTrace.java
index 414c1e5b7..163a15c05 100644
--- a/src/main/java/com/profiler/context/DefaultTrace.java
+++ b/src/main/java/com/profiler/context/DefaultTrace.java
@@ -1,8 +1,8 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
diff --git a/src/main/java/com/profiler/context/DefaultTraceContext.java b/src/main/java/com/profiler/context/DefaultTraceContext.java
index 440eff8ae..bce7292dd 100644
--- a/src/main/java/com/profiler/context/DefaultTraceContext.java
+++ b/src/main/java/com/profiler/context/DefaultTraceContext.java
@@ -4,8 +4,8 @@ package com.profiler.context;
 import com.profiler.DefaultAgent;
 import com.profiler.common.dto.thrift.ApiMetaData;
 import com.profiler.common.dto.thrift.SqlMetaData;
-import com.profiler.common.util.ParsingResult;
-import com.profiler.common.util.SqlParser;
+import com.nhn.pinpoint.common.util.ParsingResult;
+import com.nhn.pinpoint.common.util.SqlParser;
 import com.profiler.exception.PinPointException;
 import com.profiler.interceptor.MethodDescriptor;
 import com.profiler.logging.Logger;
diff --git a/src/main/java/com/profiler/context/DisableTrace.java b/src/main/java/com/profiler/context/DisableTrace.java
index c6c250710..a2391f3d0 100644
--- a/src/main/java/com/profiler/context/DisableTrace.java
+++ b/src/main/java/com/profiler/context/DisableTrace.java
@@ -1,8 +1,8 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.interceptor.MethodDescriptor;
 
 import java.util.List;
diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index bfc095a0b..06413efb3 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -1,7 +1,7 @@
 package com.profiler.context;
 
 import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.Annotation;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/profiler/context/SpanEvent.java b/src/main/java/com/profiler/context/SpanEvent.java
index 5ac73f162..660bc67e7 100644
--- a/src/main/java/com/profiler/context/SpanEvent.java
+++ b/src/main/java/com/profiler/context/SpanEvent.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.common.dto.thrift.AgentKey;
 import com.profiler.common.dto.thrift.Annotation;
 
diff --git a/src/main/java/com/profiler/context/TraceAnnotation.java b/src/main/java/com/profiler/context/TraceAnnotation.java
index d8203138c..f93fcf3e6 100644
--- a/src/main/java/com/profiler/context/TraceAnnotation.java
+++ b/src/main/java/com/profiler/context/TraceAnnotation.java
@@ -1,6 +1,6 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.common.dto.thrift.Annotation;
 import com.profiler.util.AnnotationTranscoder;
 
diff --git a/src/main/java/com/profiler/interceptor/DefaultMethodDescriptor.java b/src/main/java/com/profiler/interceptor/DefaultMethodDescriptor.java
index 25178aa04..f9789011b 100644
--- a/src/main/java/com/profiler/interceptor/DefaultMethodDescriptor.java
+++ b/src/main/java/com/profiler/interceptor/DefaultMethodDescriptor.java
@@ -1,6 +1,6 @@
 package com.profiler.interceptor;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/profiler/interceptor/bci/JavaAssistClass.java b/src/main/java/com/profiler/interceptor/bci/JavaAssistClass.java
index 5d48210ef..2cbb7c2c3 100644
--- a/src/main/java/com/profiler/interceptor/bci/JavaAssistClass.java
+++ b/src/main/java/com/profiler/interceptor/bci/JavaAssistClass.java
@@ -2,8 +2,8 @@ package com.profiler.interceptor.bci;
 
 import java.io.IOException;
 
-import com.profiler.common.mapping.ApiMappingTable;
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiMappingTable;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import com.profiler.interceptor.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.util.JavaAssistUtils;
diff --git a/src/main/java/com/profiler/io/HeaderTBaseDeserializer.java b/src/main/java/com/profiler/io/HeaderTBaseDeserializer.java
index e88e7276a..89b86d660 100644
--- a/src/main/java/com/profiler/io/HeaderTBaseDeserializer.java
+++ b/src/main/java/com/profiler/io/HeaderTBaseDeserializer.java
@@ -1,7 +1,7 @@
 package com.profiler.io;
 
 import com.profiler.common.dto.Header;
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TCompactProtocol;
diff --git a/src/main/java/com/profiler/io/HeaderTBaseSerializer.java b/src/main/java/com/profiler/io/HeaderTBaseSerializer.java
index 9988b27ba..1ef50b121 100644
--- a/src/main/java/com/profiler/io/HeaderTBaseSerializer.java
+++ b/src/main/java/com/profiler/io/HeaderTBaseSerializer.java
@@ -1,7 +1,7 @@
 package com.profiler.io;
 
 import com.profiler.common.dto.Header;
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TCompactProtocol;
@@ -9,7 +9,6 @@ import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.transport.TIOStreamTransport;
 
-import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 
 /**
diff --git a/src/main/java/com/profiler/metadata/StringCache.java b/src/main/java/com/profiler/metadata/StringCache.java
index 5aff445d1..16204343f 100644
--- a/src/main/java/com/profiler/metadata/StringCache.java
+++ b/src/main/java/com/profiler/metadata/StringCache.java
@@ -1,6 +1,6 @@
 package com.profiler.metadata;
 
-import com.profiler.common.util.BytesUtils;
+import com.nhn.pinpoint.common.util.BytesUtils;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/src/main/java/com/profiler/modifier/AbstractModifier.java b/src/main/java/com/profiler/modifier/AbstractModifier.java
index 3e7260c19..420bea8d2 100644
--- a/src/main/java/com/profiler/modifier/AbstractModifier.java
+++ b/src/main/java/com/profiler/modifier/AbstractModifier.java
@@ -2,7 +2,7 @@ package com.profiler.modifier;
 
 import com.profiler.logging.Logger;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.ServiceTypeSupport;
 
 import com.profiler.Agent;
diff --git a/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java b/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java
index 9e60e4592..e5f5feda9 100644
--- a/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java
+++ b/src/main/java/com/profiler/modifier/arcus/interceptors/BaseOperationTransitionStateInterceptor.java
@@ -8,17 +8,16 @@ import java.nio.charset.Charset;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.context.AsyncTrace;
 import com.profiler.context.TraceContext;
 import com.profiler.logging.LoggerFactory;
-import com.profiler.logging.LoggingUtils;
 import com.profiler.util.TimeObject;
 import net.spy.memcached.MemcachedNode;
 import net.spy.memcached.ops.OperationState;
 import net.spy.memcached.protocol.BaseOperationImpl;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.util.MetaObject;
 
 /**
diff --git a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java
index cbabdc1bd..389c7ca4a 100644
--- a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java
@@ -6,8 +6,8 @@ import java.util.UUID;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;
diff --git a/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java
index bfe7f1213..bae22d98e 100644
--- a/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java
@@ -11,8 +11,8 @@ import com.profiler.sampler.util.SamplingFlagUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.HttpUriRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 
 /**
  * Method interceptor
diff --git a/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/ExecuteMethodInterceptor.java
index 9998b57fd..3727839c2 100644
--- a/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/ExecuteMethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/connector/httpclient4/interceptor/ExecuteMethodInterceptor.java
@@ -3,14 +3,14 @@ package com.profiler.modifier.connector.httpclient4.interceptor;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
+import com.nhn.pinpoint.common.AnnotationKey;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 
 /**
  * Method interceptor
diff --git a/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/interceptor/ConnectMethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/interceptor/ConnectMethodInterceptor.java
index 64b935c21..f6b57ac42 100644
--- a/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/interceptor/ConnectMethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/connector/jdkhttpconnector/interceptor/ConnectMethodInterceptor.java
@@ -5,8 +5,8 @@ import java.net.HttpURLConnection;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.logging.LoggerFactory;
 import com.profiler.sampler.util.SamplingFlagUtils;
diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java
index e21a599cf..b1d77d21e 100644
--- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java
+++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java
@@ -1,6 +1,6 @@
 package com.profiler.modifier.db.interceptor;
 
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.*;
diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java
index 2702c96bb..7b2900c8d 100644
--- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java
+++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java
@@ -1,6 +1,5 @@
 package com.profiler.modifier.db.interceptor;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -8,8 +7,8 @@ import java.util.Map;
 import com.profiler.interceptor.*;
 import com.profiler.logging.Logger;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.util.ParsingResult;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.util.ParsingResult;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.util.JDBCScope;
diff --git a/src/main/java/com/profiler/modifier/method/interceptors/MethodInterceptor.java b/src/main/java/com/profiler/modifier/method/interceptors/MethodInterceptor.java
index 6efefe3d4..3d7d74b0b 100644
--- a/src/main/java/com/profiler/modifier/method/interceptors/MethodInterceptor.java
+++ b/src/main/java/com/profiler/modifier/method/interceptors/MethodInterceptor.java
@@ -3,7 +3,7 @@ package com.profiler.modifier.method.interceptors;
 import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
 
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.Trace;
 import com.profiler.context.TraceContext;
 import com.profiler.interceptor.*;
diff --git a/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java b/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java
index 263d63de8..80b685d99 100644
--- a/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java
+++ b/src/main/java/com/profiler/modifier/servlet/SpringFrameworkServletModifier.java
@@ -5,8 +5,7 @@ import com.profiler.logging.Logger;
 import com.profiler.logging.LoggerFactory;
 
 import com.profiler.Agent;
-import com.profiler.DefaultAgent;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.interceptor.Interceptor;
 import com.profiler.interceptor.bci.ByteCodeInstrumentor;
 import com.profiler.interceptor.bci.InstrumentClass;
diff --git a/src/main/java/com/profiler/modifier/servlet/interceptors/HttpServletInterceptor.java b/src/main/java/com/profiler/modifier/servlet/interceptors/HttpServletInterceptor.java
index d6137088f..42b4675ad 100644
--- a/src/main/java/com/profiler/modifier/servlet/interceptors/HttpServletInterceptor.java
+++ b/src/main/java/com/profiler/modifier/servlet/interceptors/HttpServletInterceptor.java
@@ -9,8 +9,8 @@ import com.profiler.logging.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import com.profiler.util.NumberUtils;
diff --git a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java
index 58f8f8407..a12e5e03d 100644
--- a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java
+++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java
@@ -9,8 +9,8 @@ import com.profiler.logging.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.context.*;
 import com.profiler.sampler.util.SamplingFlagUtils;
 import com.profiler.util.NetworkUtils;
diff --git a/src/main/java/com/profiler/util/AnnotationTranscoder.java b/src/main/java/com/profiler/util/AnnotationTranscoder.java
index 4d49be6f3..44061cf5b 100644
--- a/src/main/java/com/profiler/util/AnnotationTranscoder.java
+++ b/src/main/java/com/profiler/util/AnnotationTranscoder.java
@@ -2,7 +2,7 @@ package com.profiler.util;
 
 
 import com.profiler.common.dto.thrift.*;
-import com.profiler.common.util.TranscoderUtils;
+import com.nhn.pinpoint.common.util.TranscoderUtils;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/src/test/java/com/profiler/context/TraceTest.java b/src/test/java/com/profiler/context/TraceTest.java
index 1105bad48..4cde7a36e 100644
--- a/src/test/java/com/profiler/context/TraceTest.java
+++ b/src/test/java/com/profiler/context/TraceTest.java
@@ -1,7 +1,7 @@
 package com.profiler.context;
 
-import com.profiler.common.AnnotationKey;
-import com.profiler.common.ServiceType;
+import com.nhn.pinpoint.common.AnnotationKey;
+import com.nhn.pinpoint.common.ServiceType;
 import com.profiler.sender.DataSender;
 
 import com.profiler.sender.LoggingDataSender;
diff --git a/src/test/java/com/profiler/dto/HeaderTest.java b/src/test/java/com/profiler/dto/HeaderTest.java
index 4e7f921c6..e6d4eb11c 100644
--- a/src/test/java/com/profiler/dto/HeaderTest.java
+++ b/src/test/java/com/profiler/dto/HeaderTest.java
@@ -1,6 +1,6 @@
 package com.profiler.dto;
 
-import com.profiler.common.dto2.Header;
+import com.nhn.pinpoint.common.dto2.Header;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/com/profiler/modifier/mapping/ApiUtilsTest.java b/src/test/java/com/profiler/modifier/mapping/ApiUtilsTest.java
index df47a5595..a6dd0d165 100644
--- a/src/test/java/com/profiler/modifier/mapping/ApiUtilsTest.java
+++ b/src/test/java/com/profiler/modifier/mapping/ApiUtilsTest.java
@@ -1,11 +1,9 @@
 package com.profiler.modifier.mapping;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import junit.framework.Assert;
 import org.junit.Test;
 
-import java.math.MathContext;
-
 /**
  *
  */
diff --git a/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java b/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java
index 548ae0f48..fb47eb06c 100644
--- a/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java
+++ b/src/test/java/com/profiler/util/HeaderTBaseSerializerTest.java
@@ -1,11 +1,11 @@
 package com.profiler.util;
 
-import com.profiler.common.dto2.Header;
-import com.profiler.common.dto2.thrift.JVMInfoThriftDTO;
-import com.profiler.common.io.DefaultTBaseLocator;
-import com.profiler.common.io.HeaderTBaseDeserializer;
-import com.profiler.common.io.HeaderTBaseSerializer;
-import com.profiler.common.io.TBaseLocator;
+import com.nhn.pinpoint.common.dto2.Header;
+import com.nhn.pinpoint.common.dto2.thrift.JVMInfoThriftDTO;
+import com.nhn.pinpoint.common.io.DefaultTBaseLocator;
+import com.nhn.pinpoint.common.io.HeaderTBaseDeserializer;
+import com.nhn.pinpoint.common.io.HeaderTBaseSerializer;
+import com.nhn.pinpoint.common.io.TBaseLocator;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/src/test/java/com/profiler/util/JavaAssistUtilsTest.java b/src/test/java/com/profiler/util/JavaAssistUtilsTest.java
index cb50e0fc8..ead811db5 100644
--- a/src/test/java/com/profiler/util/JavaAssistUtilsTest.java
+++ b/src/test/java/com/profiler/util/JavaAssistUtilsTest.java
@@ -1,6 +1,6 @@
 package com.profiler.util;
 
-import com.profiler.common.mapping.ApiUtils;
+import com.nhn.pinpoint.common.mapping.ApiUtils;
 import javassist.*;
 import org.junit.Assert;
 import org.junit.Before;