diff --git a/cmd/chihaya/config.go b/cmd/chihaya/config.go
index 86daa7c..2fc883e 100644
--- a/cmd/chihaya/config.go
+++ b/cmd/chihaya/config.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/frontend/http"
 	"github.com/chihaya/chihaya/frontend/udp"
diff --git a/frontend/udp/connection_id.go b/frontend/udp/connection_id.go
index 991fea1..3dd6978 100644
--- a/frontend/udp/connection_id.go
+++ b/frontend/udp/connection_id.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/minio/sha256-simd"
+	sha256 "github.com/minio/sha256-simd"
 
 	"github.com/chihaya/chihaya/pkg/log"
 )
diff --git a/frontend/udp/connection_id_test.go b/frontend/udp/connection_id_test.go
index 15f68eb..36cbe9c 100644
--- a/frontend/udp/connection_id_test.go
+++ b/frontend/udp/connection_id_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minio/sha256-simd"
+	sha256 "github.com/minio/sha256-simd"
 	"github.com/stretchr/testify/require"
 
 	"github.com/chihaya/chihaya/pkg/log"
diff --git a/middleware/clientapproval/clientapproval.go b/middleware/clientapproval/clientapproval.go
index 7f1af1b..51c2a55 100644
--- a/middleware/clientapproval/clientapproval.go
+++ b/middleware/clientapproval/clientapproval.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/middleware"
diff --git a/middleware/jwt/jwt.go b/middleware/jwt/jwt.go
index 066cbd9..a7541ac 100644
--- a/middleware/jwt/jwt.go
+++ b/middleware/jwt/jwt.go
@@ -21,7 +21,7 @@ import (
 	"github.com/SermoDigital/jose/jws"
 	"github.com/SermoDigital/jose/jwt"
 	"github.com/mendsley/gojwk"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/middleware"
diff --git a/middleware/middleware.go b/middleware/middleware.go
index 8f550b8..eb23fb8 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"sync"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 var (
diff --git a/middleware/torrentapproval/torrentapproval.go b/middleware/torrentapproval/torrentapproval.go
index e45ae57..8842e39 100644
--- a/middleware/torrentapproval/torrentapproval.go
+++ b/middleware/torrentapproval/torrentapproval.go
@@ -7,7 +7,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/middleware"
diff --git a/middleware/varinterval/varinterval.go b/middleware/varinterval/varinterval.go
index 23d34b0..42b1adc 100644
--- a/middleware/varinterval/varinterval.go
+++ b/middleware/varinterval/varinterval.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/middleware"
diff --git a/storage/memory/peer_store.go b/storage/memory/peer_store.go
index b45c7cd..a3358b2 100644
--- a/storage/memory/peer_store.go
+++ b/storage/memory/peer_store.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/pkg/log"
diff --git a/storage/memorybysubnet/peer_store.go b/storage/memorybysubnet/peer_store.go
index ade63a1..c217ae3 100644
--- a/storage/memorybysubnet/peer_store.go
+++ b/storage/memorybysubnet/peer_store.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/pkg/log"