diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def
index 6d54724f7849288bee1186442c7bf14b4658e862..539807969a4f46f403544eae6540c57fcf60f1eb 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-dubbo=DubboInstrumentation
+dubbo=org.apache.skywalking.apm.plugin.dubbo.DubboInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def
index 81ca96a13405e1299764720f4b17548f17929256..3f64d923e52d497487c684ea0c941b16584609a8 100644
--- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-elastic-job-2.x=JobExecutorInstrumentation
+elastic-job-2.x=org.apache.skywalking.apm.plugin.esjob.define.JobExecutorInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def
index 24c3b8bb67eb371e718d8b3f85edbbaecf282681..fdcef6d7770bff48a3e83d695b1c4d7f6f00ed3c 100644
--- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-feign-default-http-9.x=DefaultHttpClientInstrumentation
+feign-default-http-9.x=org.apache.skywalking.apm.plugin.feign.http.v9.define.DefaultHttpClientInstrumentation
\ No newline at end of file
diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/resources/skywalking-plugin.def
index d6c13c17e6bf70c567b4a2b6f837c7ba05a83dac..a470470320a4b4054056e2c8f4237971d9d7709c 100644
--- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,9 +1,9 @@
-grpc-1.x=ClientCallInstrumentation
-grpc-1.x=UnaryClientCallListenerInstrumentation
-grpc-1.x=UnaryServerCallListenerInstrumentation
-grpc-1.x=UnaryServerCallHandlerInstrumentation
-grpc-1.x=ClientCallsInstrumentation
-grpc-1.x=ManagedChannelInstrumentation
-grpc-1.x=StreamingServerCallHandlerInstrumentation
-grpc-1.x=StreamingServerCallListenerInstrumentation
-grpc-1.x=StreamObserverToCallListenerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.ClientCallInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.UnaryClientCallListenerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.UnaryServerCallListenerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.UnaryServerCallHandlerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.ClientCallsInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.ManagedChannelInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.StreamingServerCallHandlerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.StreamingServerCallListenerInstrumentation
+grpc-1.x=org.apache.skywalking.apm.plugin.grpc.v1.define.StreamObserverToCallListenerInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/resources/skywalking-plugin.def
index a16c4b3d230c93550e137567a8012cf69ccf2bd1..588425444d3820e40a62c7b8778b9e1fc669dbe0 100644
--- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-h2-1.x=DriverInstrumentation
-h2-1.x=JdbcConnectionInstrumentation
-h2-1.x=PooledJdbcConnectionInstrumentation
-h2-1.x=JdbcXAConnectionInstrumentation
+h2-1.x=org.apache.skywalking.apm.plugin.jdbc.h2.define.DriverInstrumentation
+h2-1.x=org.apache.skywalking.apm.plugin.jdbc.h2.define.JdbcConnectionInstrumentation
+h2-1.x=org.apache.skywalking.apm.plugin.jdbc.h2.define.PooledJdbcConnectionInstrumentation
+h2-1.x=org.apache.skywalking.apm.plugin.jdbc.h2.define.JdbcXAConnectionInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
index 89e32defb09d10b2aef4229c6cf2538a6ef9c29e..145a48b0b561e5dd2b8c672915dfa1442a25af26 100644
--- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-httpclient-4.x=AbstractHttpClientInstrumentation
-httpclient-4.x=InternalHttpClientInstrumentation
-httpclient-4.x=MinimalHttpClientInstrumentation
-httpclient-4.x=DefaultRequestDirectorInstrumentation
+httpclient-4.x=org.apache.skywalking.apm.plugin.httpClient.v4.define.AbstractHttpClientInstrumentation
+httpclient-4.x=org.apache.skywalking.apm.plugin.httpClient.v4.define.InternalHttpClientInstrumentation
+httpclient-4.x=org.apache.skywalking.apm.plugin.httpClient.v4.define.MinimalHttpClientInstrumentation
+httpclient-4.x=org.apache.skywalking.apm.plugin.httpClient.v4.define.DefaultRequestDirectorInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def
index 6e343906f09464e821e42a0486e40c02fd60dcc9..0effc21a15374691af610f2a31ca781ef6f5101c 100644
--- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-jedis-2.x=JedisClusterInstrumentation
-jedis-2.x=JedisInstrumentation
+jedis-2.x=org.apache.skywalking.apm.plugin.jedis.v2.define.JedisClusterInstrumentation
+jedis-2.x=org.apache.skywalking.apm.plugin.jedis.v2.define.JedisInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/resources/skywalking-plugin.def
index 293a141abb03c694d1d185a6f1f48d5d89858139..2a8febe61d410ca18332887051bb8684b6e0eae3 100644
--- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-jetty-client-9.x=CompleteListenerInstrumentation
-jetty-client-9.x=HttpRequestInstrumentation
+jetty-client-9.x=org.apache.skywalking.apm.plugin.jetty.v9.client.define.CompleteListenerInstrumentation
+jetty-client-9.x=org.apache.skywalking.apm.plugin.jetty.v9.client.define.HttpRequestInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/resources/skywalking-plugin.def
index f2c39cb130f2d69f50f7353d1ea526c6dde47e4d..8f576643b54cde2aa4e3d048daef79b020477b8a 100644
--- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-jetty-server-9.x=JettyInstrumentation
+jetty-server-9.x=org.apache.skywalking.apm.plugin.jetty.v9.server.define.JettyInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/resources/skywalking-plugin.def
index 78ac4d5ee9b3feb99c02017767fe39d63df95a08..3f27dbc2a9822c1c998f55618af5e7b783f66f01 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-mongodb-2.x=MongoDBCollectionInstrumentation
-mongodb-2.x=MongoDBCollectionImplInstrumentation
+mongodb-2.x=org.apache.skywalking.apm.plugin.mongodb.v2.define.MongoDBCollectionInstrumentation
+mongodb-2.x=org.apache.skywalking.apm.plugin.mongodb.v2.define.MongoDBCollectionImplInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def
index 7631814411c829e1e96d0dbd5bc223ac6bc778f3..2151d110f0aaadadbd53014b2c5044d0dc9de01f 100644
--- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-mongodb-3.x=MongoDBInstrumentation
+mongodb-3.x=org.apache.skywalking.apm.plugin.mongodb.v3.define.MongoDBInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def
index 512d40fb3a67b91a496e1f11bc1a2c4883638cf5..b3db6bc36dcfe3c4285878c527451f74da2a6596 100644
--- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-motan-0.x=MotanConsumerInstrumentation
-motan-0.x=MotanProviderInstrumentation
+motan-0.x=org.apache.skywalking.apm.plugin.motan.define.MotanConsumerInstrumentation
+motan-0.x=org.apache.skywalking.apm.plugin.motan.define.MotanProviderInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/resources/skywalking-plugin.def
index cb330f316f7e6af7d9281e1280557a8a3838dd5c..38d7efe2abcae760785bb387fab5aeb26b8cbb32 100644
--- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,6 +1,6 @@
-mysql-5.x=DriverInstrumentation
-mysql-5.x=Mysql5xConnectionInstrumentation
-mysql-5.x=Mysql50ConnectionInstrumentation
-mysql-5.x=CallableInstrumentation
-mysql-5.x=PreparedStatementInstrumentation
-mysql-5.x=StatementInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.DriverInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.Mysql5xConnectionInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.Mysql50ConnectionInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.CallableInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.PreparedStatementInstrumentation
+mysql-5.x=org.apache.skywalking.apm.plugin.jdbc.mysql.define.StatementInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/resources/skywalking-plugin.def
index 25e732f6107852fef8c1d36a0fe8f53cfeb499db..0bd2b974c05617c0dd54901f7c0426e62d200989 100644
--- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,3 +1,3 @@
-nutz-http-1.x=NutzHttpGetSenderInstrumentation
-nutz-http-1.x=NutzHttpPostSenderInstrumentation
-nutz-http-1.x=NutzHttpFilePostSenderInstrumentation
+nutz-http-1.x=org.apache.skywalking.apm.plugin.nutz.http.sync.define.NutzHttpGetSenderInstrumentation
+nutz-http-1.x=org.apache.skywalking.apm.plugin.nutz.http.sync.define.NutzHttpPostSenderInstrumentation
+nutz-http-1.x=org.apache.skywalking.apm.plugin.nutz.http.sync.define.NutzHttpFilePostSenderInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/resources/skywalking-plugin.def
index d10d3982c2b44e245657ea59b3764718ad1b3554..9b1055d5fa10acfd6256d7214e23223a8512b6d5 100644
--- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-nutz-mvc-annotation-1.x=ActionInstrumentation
+nutz-mvc-annotation-1.x=org.apache.skywalking.apm.plugin.nutz.mvc.define.ActionInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/resources/skywalking-plugin.def
index 9252ee2ceb9565882cff7d9dd0106787b1bf456e..dd2eec44540473f0c3026b01130ed113436fbdfe 100644
--- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-okhttp-3.x=RealCallInstrumentation
+okhttp-3.x=org.apache.skywalking.apm.plugin.okhttp.v3.define.RealCallInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def
index e2a524a6ed6c22348e3deaf3abc36d757ef2ad44..3a3b19358f901488a79d874767779de21a86a02f 100644
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-oracle-10.x=DriverInstrumentation
-oracle-10.x=ConnectionInstrumentation
+oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation
+oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
index 363b2f24133e64a555c3120f64d1445787bc3621..77839a7d8c94b638375d323eb9872fe64b1e4570 100644
--- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,5 +1,5 @@
-postgresql-8.x=DriverInstrumentation
-postgresql-8.x=Jdbc3ConnectionInstrumentation
-postgresql-8.x=Jdbc4ConnectionInstrumentation
-postgresql-8.x=ConnectionInstrumentation
-postgresql-8.x=AbstractJdbc2StatementInstrumentation
+postgresql-8.x=org.apache.skywalking.apm.plugin.jdbc.postgresql.define.DriverInstrumentation
+postgresql-8.x=org.apache.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc3ConnectionInstrumentation
+postgresql-8.x=org.apache.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc4ConnectionInstrumentation
+postgresql-8.x=org.apache.skywalking.apm.plugin.jdbc.postgresql.define.ConnectionInstrumentation
+postgresql-8.x=org.apache.skywalking.apm.plugin.jdbc.postgresql.define.AbstractJdbc2StatementInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def
index 1bab5044defb937e8516ce6810ac9e5e75b3e67f..cd908893ba7423a42b46a48acc6851404c1e72ef 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-resin-3.x=ResinV3Instrumentation
+resin-3.x=org.apache.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def
index 3d879538d6b4256fd055c6be9f4038d78e972dd8..d7f7e96764c43a4214a1dc2013a6381937c8369e 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-resin-4.x=ResinV4Instrumentation
+resin-4.x=org.apache.skywalking.apm.plugin.resin.v4.define.ResinV4Instrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/resources/skywalking-plugin.def
index bba21da0ad8af8d2a21954ce42f06edbeebe10c0..9f51b24b1d86e493853b97d0bbb38969c5439ee1 100644
--- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-rocketMQ-4.x=ConsumeMessageConcurrentlyInstrumentation
-rocketMQ-4.x=ConsumeMessageOrderlyInstrumentation
-rocketMQ-4.x=MQClientAPIImplInstrumentation
-rocketMQ-4.x=SendCallbackInstrumentation
+rocketMQ-4.x=org.apache.skywalking.apm.plugin.rocketMQ.v4.define.ConsumeMessageConcurrentlyInstrumentation
+rocketMQ-4.x=org.apache.skywalking.apm.plugin.rocketMQ.v4.define.ConsumeMessageOrderlyInstrumentation
+rocketMQ-4.x=org.apache.skywalking.apm.plugin.rocketMQ.v4.define.MQClientAPIImplInstrumentation
+rocketMQ-4.x=org.apache.skywalking.apm.plugin.rocketMQ.v4.define.SendCallbackInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/resources/skywalking-plugin.def
index 56f3301f6009d45409e9b2abd965b5b484dcf6c7..5328c5c67daa9eb789d310d3793031fc78cea0bd 100644
--- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-sharding-jdbc-1.5.x=ExecutorInstrumentation
+sharding-jdbc-1.5.x=org.apache.skywalking.apm.plugin.sjdbc.define.ExecutorInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/resources/skywalking-plugin.def
index 67ab86c550df7542a9deaa005a291c58a9825a60..96f090f565d18233f3234d7edf0d2fc56b294c3a 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,3 +1,3 @@
-spring-concurrent-util-4.x=FailureCallbackInstrumentation
-spring-concurrent-util-4.x=SuccessCallbackInstrumentation
-spring-concurrent-util-4.x=ListenableFutureCallbackInstrumentation
+spring-concurrent-util-4.x=org.apache.skywalking.apm.plugin.spring.concurrent.define.FailureCallbackInstrumentation
+spring-concurrent-util-4.x=org.apache.skywalking.apm.plugin.spring.concurrent.define.SuccessCallbackInstrumentation
+spring-concurrent-util-4.x=org.apache.skywalking.apm.plugin.spring.concurrent.define.ListenableFutureCallbackInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def
index 91984358306b3f1b115a12c0f20cda88a710e635..9365471a2da29791f186443977375e265657cdb4 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,2 @@
-spring-core-patch=AopProxyFactoryInstrumentation
-spring-core-patch=AutowiredAnnotationProcessorInstrumentation
+spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AopProxyFactoryInstrumentation
+spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AutowiredAnnotationProcessorInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/resources/skywalking-plugin.def
index 281c61197bc9ed6bf9efa78b1941abe660c483c2..90c5f1e4896b79221b6880b89011f21b11c671d5 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-spring-mvc-annotation-3.x=ControllerInstrumentation
-spring-mvc-annotation-3.x=HandlerMethodInstrumentation
-spring-mvc-annotation-3.x=InvocableHandlerInstrumentation
-spring-mvc-annotation-3.x=HandlerMethodInvokerInstrumentation
+spring-mvc-annotation-3.x=org.apache.skywalking.apm.plugin.spring.mvc.v3.define.ControllerInstrumentation
+spring-mvc-annotation-3.x=org.apache.skywalking.apm.plugin.spring.mvc.v3.define.HandlerMethodInstrumentation
+spring-mvc-annotation-3.x=org.apache.skywalking.apm.plugin.spring.mvc.v3.define.InvocableHandlerInstrumentation
+spring-mvc-annotation-3.x=org.apache.skywalking.apm.plugin.spring.mvc.v3.define.HandlerMethodInvokerInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def
index 5198f6d2eb8b3f872c851afbf78e78cae12c81af..5781183f6c26faf09fbf49d7ce4a00e5703aaf78 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-spring-mvc-annotation-4.x=ControllerInstrumentation
-spring-mvc-annotation-4.x=RestControllerInstrumentation
-spring-mvc-annotation-4.x=HandlerMethodInstrumentation
-spring-mvc-annotation-4.x=InvocableHandlerInstrumentation
+spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.ControllerInstrumentation
+spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.RestControllerInstrumentation
+spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.HandlerMethodInstrumentation
+spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.InvocableHandlerInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/resources/skywalking-plugin.def
index 07498b3ee826d1232702a95075fce932a08fbaf0..a2a82c907a92bfaf9f83bde6d434f630927ab4c8 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,3 +1,3 @@
-spring-resttemplate-4.x=RestTemplateInstrumentation
-spring-resttemplate-4.x=ResponseExtractorFutureInstrumentation
-spring-resttemplate-4.x=RestTemplateInstrumentation
+spring-resttemplate-4.x=org.apache.skywalking.apm.plugin.spring.resttemplate.sync.define.RestTemplateInstrumentation
+spring-resttemplate-4.x=org.apache.skywalking.apm.plugin.spring.resttemplate.async.define.ResponseExtractorFutureInstrumentation
+spring-resttemplate-4.x=org.apache.skywalking.apm.plugin.spring.resttemplate.async.define.RestTemplateInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/resources/skywalking-plugin.def
index e641f2eaa4f71cfc03ab9cbaf144fbf5b51a2773..1ec728c6e44ac41ab76c4ad3b3726640fa7d83b4 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-spring-cloud-feign-1.x=NetflixFeignInstrumentation
+spring-cloud-feign-1.x=org.apache.skywalking.apm.plugin.spring.cloud.netflix.feign.v11.define.NetflixFeignInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
index 2baae8572f0ef8b29f1af9f0547fd561c2bb786a..d7f6827a9b2a7a5e8a2a369ea7cfa8d296625122 100644
--- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-spymemcached-2.x=MemcachedInstrumentation
+spymemcached-2.x=org.apache.skywalking.apm.plugin.spymemcached.v2.define.MemcachedInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/resources/skywalking-plugin.def
index ea021e9e02fe21528caecabda0726c62f80ccdcf..8a22859e63a85083891f66d038093be061cf95df 100644
--- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-struts2-2.x=Struts2Instrumentation
+struts2-2.x=org.apache.skywalking.apm.plugin.struts2.define.Struts2Instrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def
index df074e77628a706c744714180fc54b5943325d9d..32ee90f96f4706dc2b1f7b25f9e9a6c9122ee655 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-tomcat-7.x/8.x=TomcatInstrumentation
+tomcat-7.x/8.x=org.apache.skywalking.apm.plugin.tomcat78x.define.TomcatInstrumentation
diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
index c91ef35c4e5416dabfec24d76b2245f51dc2fce5..8f7df1c158a668c1849beaeb3bef3762b3caed6c 100644
--- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1 +1 @@
-memcache-2.x=XMemcachedInstrumentation
+memcache-2.x=org.apache.skywalking.apm.plugin.xmemcached.v2.define.XMemcachedInstrumentation