diff --git a/anonymize/anonymize_config_test.go b/anonymize/anonymize_config_test.go
index de449f3c1..961583851 100644
--- a/anonymize/anonymize_config_test.go
+++ b/anonymize/anonymize_config_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/containous/traefik/safe"
 	traefiktls "github.com/containous/traefik/tls"
 	"github.com/containous/traefik/types"
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 	"github.com/thoas/stats"
 )
 
diff --git a/api/dashboard.go b/api/dashboard.go
index a3232a166..bb6e7db5e 100644
--- a/api/dashboard.go
+++ b/api/dashboard.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/containous/mux"
 	"github.com/containous/traefik/log"
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 )
 
 // DashboardHandler expose dashboard routes
diff --git a/api/handler.go b/api/handler.go
index 370955978..a84282e49 100644
--- a/api/handler.go
+++ b/api/handler.go
@@ -9,7 +9,7 @@ import (
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	"github.com/containous/traefik/version"
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 	thoas_stats "github.com/thoas/stats"
 	"github.com/unrolled/render"
 )
diff --git a/cluster/datastore.go b/cluster/datastore.go
index 168745e27..4cdb0cf87 100644
--- a/cluster/datastore.go
+++ b/cluster/datastore.go
@@ -13,7 +13,7 @@ import (
 	"github.com/containous/traefik/job"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/safe"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 )
 
 // Metadata stores Object plus metadata
diff --git a/cmd/configuration.go b/cmd/configuration.go
index c523126bc..b180e1b6f 100644
--- a/cmd/configuration.go
+++ b/cmd/configuration.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/containous/flaeg"
-	"github.com/containous/traefik-extra-service-fabric"
+	servicefabric "github.com/containous/traefik-extra-service-fabric"
 	"github.com/containous/traefik/api"
 	"github.com/containous/traefik/configuration"
 	"github.com/containous/traefik/middlewares/accesslog"
diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go
index 5f851af5f..92684be77 100644
--- a/cmd/traefik/traefik.go
+++ b/cmd/traefik/traefik.go
@@ -34,7 +34,7 @@ import (
 	"github.com/containous/traefik/types"
 	"github.com/containous/traefik/version"
 	"github.com/coreos/go-systemd/daemon"
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 	"github.com/ogier/pflag"
 	"github.com/sirupsen/logrus"
 	"github.com/vulcand/oxy/roundrobin"
diff --git a/configuration/configuration.go b/configuration/configuration.go
index 7eab2d98a..b878391d4 100644
--- a/configuration/configuration.go
+++ b/configuration/configuration.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/containous/flaeg"
-	"github.com/containous/traefik-extra-service-fabric"
+	servicefabric "github.com/containous/traefik-extra-service-fabric"
 	"github.com/containous/traefik/acme"
 	"github.com/containous/traefik/api"
 	"github.com/containous/traefik/log"
diff --git a/integration/etcd3_test.go b/integration/etcd3_test.go
index 6d5c859a6..a89700651 100644
--- a/integration/etcd3_test.go
+++ b/integration/etcd3_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/abronan/valkeyrie"
 	"github.com/abronan/valkeyrie/store"
-	"github.com/abronan/valkeyrie/store/etcd/v3"
+	etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3"
 	"github.com/containous/traefik/integration/try"
 	"github.com/go-check/check"
 
diff --git a/provider/etcd/etcd.go b/provider/etcd/etcd.go
index cc78951ef..6ab6c1cdc 100644
--- a/provider/etcd/etcd.go
+++ b/provider/etcd/etcd.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/abronan/valkeyrie/store"
 	"github.com/abronan/valkeyrie/store/etcd/v2"
-	"github.com/abronan/valkeyrie/store/etcd/v3"
+	etcdv3 "github.com/abronan/valkeyrie/store/etcd/v3"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/provider"
 	"github.com/containous/traefik/provider/kv"
diff --git a/provider/kubernetes/weight_allocator_test.go b/provider/kubernetes/weight_allocator_test.go
index d3b4a45da..2af98904e 100644
--- a/provider/kubernetes/weight_allocator_test.go
+++ b/provider/kubernetes/weight_allocator_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )