diff --git a/backend/amazonclouddrive/amazonclouddrive.go b/backend/amazonclouddrive/amazonclouddrive.go
index 12858a20e..a1288aa67 100644
--- a/backend/amazonclouddrive/amazonclouddrive.go
+++ b/backend/amazonclouddrive/amazonclouddrive.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ncw/go-acd"
+	acd "github.com/ncw/go-acd"
 	"github.com/ncw/rclone/fs"
 	"github.com/ncw/rclone/fs/config"
 	"github.com/ncw/rclone/fs/config/configmap"
diff --git a/backend/cache/plex.go b/backend/cache/plex.go
index c3a2aba6a..01f3367ed 100644
--- a/backend/cache/plex.go
+++ b/backend/cache/plex.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/fs"
-	"github.com/patrickmn/go-cache"
+	cache "github.com/patrickmn/go-cache"
 	"golang.org/x/net/websocket"
 )
 
diff --git a/backend/cache/storage_memory.go b/backend/cache/storage_memory.go
index 2ea0f8c8b..d88f99596 100644
--- a/backend/cache/storage_memory.go
+++ b/backend/cache/storage_memory.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/ncw/rclone/fs"
-	"github.com/patrickmn/go-cache"
+	cache "github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
 )
 
diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go
index e37d83f9c..7a1704c0b 100644
--- a/backend/sftp/sftp.go
+++ b/backend/sftp/sftp.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ncw/rclone/lib/readers"
 	"github.com/pkg/errors"
 	"github.com/pkg/sftp"
-	"github.com/xanzy/ssh-agent"
+	sshagent "github.com/xanzy/ssh-agent"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/time/rate"
 )
diff --git a/cmd/mountlib/daemon_unix.go b/cmd/mountlib/daemon_unix.go
index 23df2d204..e1988cb32 100644
--- a/cmd/mountlib/daemon_unix.go
+++ b/cmd/mountlib/daemon_unix.go
@@ -7,7 +7,7 @@ package mountlib
 import (
 	"log"
 
-	"github.com/sevlyar/go-daemon"
+	daemon "github.com/sevlyar/go-daemon"
 )
 
 func startBackgroundMode() bool {
diff --git a/fstest/test_all/config.go b/fstest/test_all/config.go
index 8f2897578..9ee9fa09d 100644
--- a/fstest/test_all/config.go
+++ b/fstest/test_all/config.go
@@ -10,7 +10,7 @@ import (
 	"path"
 
 	"github.com/pkg/errors"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // Test describes an integration test to run with `go test`