diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go
index d7f5850d2..ab8cee7cf 100644
--- a/etcdserver/api/capability.go
+++ b/etcdserver/api/capability.go
@@ -30,7 +30,7 @@ const (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "api")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api")
 
 	// capabilityMaps is a static map of version to capability map.
 	// the base capabilities is the set of capability 2.0 supports.
diff --git a/etcdserver/api/v2http/http.go b/etcdserver/api/v2http/http.go
index c22d81436..62c99e19d 100644
--- a/etcdserver/api/v2http/http.go
+++ b/etcdserver/api/v2http/http.go
@@ -35,7 +35,7 @@ const (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v2http")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http")
 	mlog = logutil.NewMergeLogger(plog)
 )
 
diff --git a/etcdserver/api/v2http/httptypes/errors.go b/etcdserver/api/v2http/httptypes/errors.go
index a6c0f6d0b..0657604ca 100644
--- a/etcdserver/api/v2http/httptypes/errors.go
+++ b/etcdserver/api/v2http/httptypes/errors.go
@@ -22,7 +22,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api/v2http", "httptypes")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v2http/httptypes")
 )
 
 type HTTPError struct {
diff --git a/etcdserver/api/v3rpc/grpc.go b/etcdserver/api/v3rpc/grpc.go
index 07c65320b..88174e3ba 100644
--- a/etcdserver/api/v3rpc/grpc.go
+++ b/etcdserver/api/v3rpc/grpc.go
@@ -19,14 +19,13 @@ import (
 
 	"github.com/coreos/etcd/etcdserver"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
-	"github.com/coreos/pkg/capnslog"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
 )
 
 func init() {
-	grpclog.SetLogger(capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "v3rpc/grpc"))
+	grpclog.SetLogger(plog)
 }
 
 func Server(s *etcdserver.EtcdServer, tls *tls.Config) *grpc.Server {
diff --git a/etcdserver/api/v3rpc/key.go b/etcdserver/api/v3rpc/key.go
index 94875ff2b..69374cda6 100644
--- a/etcdserver/api/v3rpc/key.go
+++ b/etcdserver/api/v3rpc/key.go
@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v3rpc")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/v3rpc")
 
 	// Max operations per txn list. For example, Txn.Success can have at most 128 operations,
 	// and Txn.Failure can have at most 128 operations.
diff --git a/etcdserver/auth/auth.go b/etcdserver/auth/auth.go
index d747ba0fc..0922a7f8b 100644
--- a/etcdserver/auth/auth.go
+++ b/etcdserver/auth/auth.go
@@ -46,7 +46,7 @@ const (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "auth")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/auth")
 )
 
 var rootRole = Role{
diff --git a/etcdserver/membership/member.go b/etcdserver/membership/member.go
index 35ce3a973..6de74d26f 100644
--- a/etcdserver/membership/member.go
+++ b/etcdserver/membership/member.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "membership")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/membership")
 )
 
 // RaftAttributes represents the raft related attributes of an etcd member.
diff --git a/etcdserver/stats/stats.go b/etcdserver/stats/stats.go
index e79339894..2b5f7071a 100644
--- a/etcdserver/stats/stats.go
+++ b/etcdserver/stats/stats.go
@@ -18,7 +18,7 @@ package stats
 import "github.com/coreos/pkg/capnslog"
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "stats")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats")
 )
 
 type Stats interface {
diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go
index 51b89021d..1be8b6697 100644
--- a/mvcc/backend/backend.go
+++ b/mvcc/backend/backend.go
@@ -40,7 +40,7 @@ var (
 	// This only works for linux.
 	InitialMmapSize = int64(10 * 1024 * 1024 * 1024)
 
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/mvcc", "backend")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend")
 )
 
 const (
diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go
index 6ecf449f5..d024de6f3 100644
--- a/proxy/httpproxy/reverse.go
+++ b/proxy/httpproxy/reverse.go
@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/proxy", "httpproxy")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/httpproxy")
 
 	// Hop-by-hop headers. These are removed when sent to the backend.
 	// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
diff --git a/proxy/tcpproxy/userspace.go b/proxy/tcpproxy/userspace.go
index d84445a81..d8ff11ec5 100644
--- a/proxy/tcpproxy/userspace.go
+++ b/proxy/tcpproxy/userspace.go
@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/proxy", "tcpproxy")
+	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/tcpproxy")
 )
 
 type remote struct {