diff --git a/cmd/ipfs2/main.go b/cmd/ipfs2/main.go
index 52873dfe1090a3c9a0055dc03f9554a1ea264425..a900ac34bb91c340628e079c2d66e3dc57a957ea 100644
--- a/cmd/ipfs2/main.go
+++ b/cmd/ipfs2/main.go
@@ -22,11 +22,11 @@ import (
 	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 	errors "github.com/jbenet/go-ipfs/util/debugerror"
-	elog "github.com/jbenet/go-ipfs/util/elog"
+	eventlog "github.com/jbenet/go-ipfs/util/elog"
 )
 
 // log is the command logger
-var log = elog.Logger("cmd/ipfs")
+var log = eventlog.Logger("cmd/ipfs")
 
 // signal to output help
 var errHelpRequested = errors.New("Help Requested")
@@ -496,20 +496,20 @@ func allInterruptSignals() chan os.Signal {
 func configureEventLogger(config *config.Config) error {
 
 	if u.Debug {
-		elog.Configure(elog.LevelDebug)
+		eventlog.Configure(eventlog.LevelDebug)
 	} else {
-		elog.Configure(elog.LevelInfo)
+		eventlog.Configure(eventlog.LevelInfo)
 	}
 
-	elog.Configure(elog.LdJSONFormatter)
+	eventlog.Configure(eventlog.LdJSONFormatter)
 
-	rotateConf := elog.LogRotatorConfig{
+	rotateConf := eventlog.LogRotatorConfig{
 		Filename:   config.Logs.Filename,
 		MaxSizeMB:  config.Logs.MaxSizeMB,
 		MaxBackups: config.Logs.MaxBackups,
 		MaxAgeDays: config.Logs.MaxAgeDays,
 	}
 
-	elog.Configure(elog.OutputRotatingLogFile(rotateConf))
+	eventlog.Configure(eventlog.OutputRotatingLogFile(rotateConf))
 	return nil
 }
diff --git a/net/swarm/addrs.go b/net/swarm/addrs.go
index a7627ee925c86506ef659eb2863427884de2779d..614e519894389d0a67b027325d7ae4e99dababd9 100644
--- a/net/swarm/addrs.go
+++ b/net/swarm/addrs.go
@@ -54,12 +54,12 @@ func resolveUnspecifiedAddresses(unspecifiedAddrs []ma.Multiaddr) ([]ma.Multiadd
 		}
 	}
 
-	log.Event(context.TODO(), "interfaceListenAddresses", func() elog.Loggable {
+	log.Event(context.TODO(), "interfaceListenAddresses", func() eventlog.Loggable {
 		var addrs []string
 		for _, addr := range outputAddrs {
 			addrs = append(addrs, addr.String())
 		}
-		return elog.Metadata{"addresses": addrs}
+		return eventlog.Metadata{"addresses": addrs}
 	}())
 	log.Info("InterfaceListenAddresses:", outputAddrs)
 	return outputAddrs, nil
diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go
index 2768f326b6dfda0565b6eb07d2e133a8459b704b..dafa4b119e72ff822bd06a0d68f17d1bf5f8a947 100644
--- a/net/swarm/swarm.go
+++ b/net/swarm/swarm.go
@@ -19,7 +19,7 @@ import (
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
-var log = elog.Logger("swarm")
+var log = eventlog.Logger("swarm")
 
 // ErrAlreadyOpen signals that a connection to a peer is already open.
 var ErrAlreadyOpen = errors.New("Error: Connection to this peer already open.")
diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index 1af4a29bd9ef94766f0ccda5cebab66c372cac59..f042bbd4bca76dc97089b4449014b7c5d02dce38 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -26,7 +26,7 @@ import (
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 )
 
-var log = elog.Logger("dht")
+var log = eventlog.Logger("dht")
 
 const doPinging = false
 
diff --git a/util/elog/context.go b/util/eventlog/context.go
similarity index 97%
rename from util/elog/context.go
rename to util/eventlog/context.go
index 92e80ce8909f4da6b7e5895017d02df37e752fd9..03e2e3c5f4fad1015fa7780a7680b209b9bc7ca4 100644
--- a/util/elog/context.go
+++ b/util/eventlog/context.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import (
 	"errors"
diff --git a/util/elog/context_test.go b/util/eventlog/context_test.go
similarity index 98%
rename from util/elog/context_test.go
rename to util/eventlog/context_test.go
index c973a104b3eafabb433c768e76ef45e02988396c..1bab63269129a63605b99f7e966189f15edf849e 100644
--- a/util/elog/context_test.go
+++ b/util/eventlog/context_test.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import (
 	"testing"
diff --git a/util/elog/log.go b/util/eventlog/log.go
similarity index 99%
rename from util/elog/log.go
rename to util/eventlog/log.go
index 78a47d8dcac9175f9e532d603908c57590d0bdfd..06b8e5444e83e0860ddf9d581811fb28d72aa407 100644
--- a/util/elog/log.go
+++ b/util/eventlog/log.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import (
 	"time"
diff --git a/util/elog/metadata.go b/util/eventlog/metadata.go
similarity index 99%
rename from util/elog/metadata.go
rename to util/eventlog/metadata.go
index a6408d98464d3a3a50de22b8414e557a30d85e10..ea3cad6b597edcafaebf0af759ae8912f04bc11d 100644
--- a/util/elog/metadata.go
+++ b/util/eventlog/metadata.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import (
 	"encoding/json"
diff --git a/util/elog/metadata_test.go b/util/eventlog/metadata_test.go
similarity index 97%
rename from util/elog/metadata_test.go
rename to util/eventlog/metadata_test.go
index 2abfc6d7ee5257b40e82854d8b12a02374a46e02..bb07e700a1cd17b19d495d7a2860d192313cf6fb 100644
--- a/util/elog/metadata_test.go
+++ b/util/eventlog/metadata_test.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import "testing"
 
diff --git a/util/elog/option.go b/util/eventlog/option.go
similarity index 98%
rename from util/elog/option.go
rename to util/eventlog/option.go
index a25a1d06c9128e2f52076cfc48177badc0b66b77..b278d3e92afc97a538aa599fc7485fdf6c1dbbf9 100644
--- a/util/elog/option.go
+++ b/util/eventlog/option.go
@@ -1,4 +1,4 @@
-package elog
+package eventlog
 
 import (
 	"io"