diff --git a/README.md b/README.md
index 280b975dcdbba0a2a7b51c35898ce59fdd741b32..4e7511637dbe6f30473cbcedadeb9f0efd372e50 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Install dependencies:
 
 Build the systray:
 ```
-  $ git clone 0xacab.org/leap/bitmask-systray
+  $ git clone 0xacab.org/leap/bitmask-vpn
   $ cd bitmask-systray
   $ go get .
   $ go build
@@ -26,7 +26,7 @@ Using homebrew:
 ```
   $ brew install golang zmq pkg-config
   $ brew install --default-names gnu-sed
-  $ git clone 0xacab.org/leap/bitmask-systray
+  $ git clone 0xacab.org/leap/bitmask-vpn
   $ cd bitmask-systray
   $ go get .
   $ go build
diff --git a/cmd/bitmask-connect/main.go b/cmd/bitmask-connect/main.go
index 158f422a5cd3e8f9a0a7c1d99e0756638543e683..9046d5c185d6b57c92e041a60f45155813ae4862 100644
--- a/cmd/bitmask-connect/main.go
+++ b/cmd/bitmask-connect/main.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"os/signal"
 
-	"0xacab.org/leap/bitmask-systray/pkg/bitmask"
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
 )
diff --git a/cmd/bitmask-helper/main.go b/cmd/bitmask-helper/main.go
index 9673763138e089ec589ef3c5653a0f35af61aed9..ce32b4ea182aabc6af0b11b505cb335f8ddaf47f 100644
--- a/cmd/bitmask-helper/main.go
+++ b/cmd/bitmask-helper/main.go
@@ -19,8 +19,8 @@ import (
 	"log"
 	"path"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
-	"0xacab.org/leap/bitmask-systray/pkg/helper"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/helper"
 )
 
 const (
diff --git a/cmd/bitmask-vpn/main.go b/cmd/bitmask-vpn/main.go
index 08ccbf17fa39fe51e37e8c19be8a917c83a99386..a9b238969655d793456ce765891c26b1825254df 100644
--- a/cmd/bitmask-vpn/main.go
+++ b/cmd/bitmask-vpn/main.go
@@ -23,8 +23,8 @@ import (
 	"path"
 	"runtime"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
-	"0xacab.org/leap/bitmask-systray/pkg/systray"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/systray"
 	"github.com/jmshal/go-locale"
 	"golang.org/x/text/message"
 )
diff --git a/pkg/bitmask/bitmaskd.go b/pkg/bitmask/bitmaskd.go
index ad4da317e86228b6a71b2bc84768b0ce85fb8d85..04b965cfdc5177ee823c467c59b812b8194e09c2 100644
--- a/pkg/bitmask/bitmaskd.go
+++ b/pkg/bitmask/bitmaskd.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"log"
 
-	"0xacab.org/leap/bitmask-systray/pkg/bitmaskd"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmaskd"
 	"golang.org/x/text/message"
 )
 
diff --git a/pkg/bitmask/standalone.go b/pkg/bitmask/standalone.go
index f3f7602b496bc576aa3451608c4d62ddee36a229..8ae6f3955224f7d99becf8b2f99aef7fbc82c321 100644
--- a/pkg/bitmask/standalone.go
+++ b/pkg/bitmask/standalone.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"0xacab.org/leap/bitmask-systray/pkg/standalone"
+	"0xacab.org/leap/bitmask-vpn/pkg/standalone"
 	pmautostart "github.com/ProtonMail/go-autostart"
 	"golang.org/x/text/message"
 )
diff --git a/pkg/bitmaskd/main.go b/pkg/bitmaskd/main.go
index f2ca65041d2c65b3d245fd26497c40570561c0b9..b0d034962f02abbb10813ede03cd3d4b846ec863 100644
--- a/pkg/bitmaskd/main.go
+++ b/pkg/bitmaskd/main.go
@@ -25,7 +25,7 @@ import (
 	"path"
 	"time"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 const (
diff --git a/pkg/helper/darwin.go b/pkg/helper/darwin.go
index ff4ae4dbef8e45c524fc82da94a10c81c3146800..49924e5413630a698e4dce86435f929470a7ac5c 100644
--- a/pkg/helper/darwin.go
+++ b/pkg/helper/darwin.go
@@ -36,7 +36,7 @@ import (
 	"path"
 	"strings"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"github.com/sevlyar/go-daemon"
 )
 
diff --git a/pkg/helper/linux.go b/pkg/helper/linux.go
index 79d301d71917ee622e7dc49ab8b44730188fa112..8ee30372d8fb0e695a3eca516ccc24beefd8c532 100644
--- a/pkg/helper/linux.go
+++ b/pkg/helper/linux.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"os/exec"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 const (
diff --git a/pkg/helper/windows.go b/pkg/helper/windows.go
index 4e4e89dd75eba3c515920c98c7e00a620e4d4f94..bc86e799f76e482f470f56f322f28ca0e7d6d86c 100644
--- a/pkg/helper/windows.go
+++ b/pkg/helper/windows.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"os/exec"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 const (
diff --git a/pkg/standalone/bonafide.go b/pkg/standalone/bonafide.go
index a0ed3b622fa7a2a7bfd6d0bb338ab57cd8e46f91..ac09362bf57ffc0c8db8dd377171f5ec542c5a67 100644
--- a/pkg/standalone/bonafide.go
+++ b/pkg/standalone/bonafide.go
@@ -30,7 +30,7 @@ import (
 	"strings"
 	"time"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 const (
diff --git a/pkg/standalone/launcher_linux.go b/pkg/standalone/launcher_linux.go
index b7e5f3d9bde3559918b39b5ec8d45b6f37b94422..b211b7092e18d8c63b1ef5f4206a3d424d6f1ea2 100644
--- a/pkg/standalone/launcher_linux.go
+++ b/pkg/standalone/launcher_linux.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"os/exec"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 const (
diff --git a/pkg/standalone/main.go b/pkg/standalone/main.go
index d5618e545500066518f66ace45b27cfcdd0555eb..319af7953848eef1a29b4ef4b1a6b74719131844 100644
--- a/pkg/standalone/main.go
+++ b/pkg/standalone/main.go
@@ -20,7 +20,7 @@ import (
 	"log"
 	"os"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"github.com/apparentlymart/go-openvpn-mgmt/openvpn"
 )
 
diff --git a/pkg/systray/config.go b/pkg/systray/config.go
index 1bacb1bacf40b452ff14dfbdd8e087a3788ef1df..c40a27979fe45439385d0b22ecb26262e16d442d 100644
--- a/pkg/systray/config.go
+++ b/pkg/systray/config.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"time"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"golang.org/x/text/message"
 )
 
diff --git a/pkg/systray/notificator.go b/pkg/systray/notificator.go
index 754a2e81764b4be99bed127bda19aff4b0ffdd2d..80d08c261ba58cf893b846af5696f859b42baed4 100644
--- a/pkg/systray/notificator.go
+++ b/pkg/systray/notificator.go
@@ -22,7 +22,7 @@ import (
 	"runtime"
 	"time"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"0xacab.org/leap/go-dialog"
 	"github.com/skratchdot/open-golang/open"
 )
diff --git a/pkg/systray/pid.go b/pkg/systray/pid.go
index 6a1b32c2e05d314c10fdac3b438423299b04a6f0..ba3a6f34d3024db830c781542b82bdfd2ecf2ed6 100644
--- a/pkg/systray/pid.go
+++ b/pkg/systray/pid.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"syscall"
 
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"github.com/mitchellh/go-ps"
 )
 
diff --git a/pkg/systray/run.go b/pkg/systray/run.go
index 73dc85314ff4277994da247d6f4d8ce72df03080..8877d646f4dad154140700efc2c157e23acceee5 100644
--- a/pkg/systray/run.go
+++ b/pkg/systray/run.go
@@ -19,8 +19,8 @@ import (
 	"log"
 	"os"
 
-	"0xacab.org/leap/bitmask-systray/pkg/bitmask"
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 )
 
 func Run(conf *Config) {
diff --git a/pkg/systray/signal_unix.go b/pkg/systray/signal_unix.go
index 06b59ae8948480ad41c05905d85cda2e83194b0c..d9e784d56a4241cb224cba21e53a28c0f796f03a 100644
--- a/pkg/systray/signal_unix.go
+++ b/pkg/systray/signal_unix.go
@@ -21,7 +21,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"0xacab.org/leap/bitmask-systray/pkg/bitmask"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
 )
 
 func listenSignals(bm bitmask.Bitmask) {
diff --git a/pkg/systray/signal_windows.go b/pkg/systray/signal_windows.go
index f96212cbf5b52dbad8cafade3a99afec1b3140fd..ac0528c427789d3e4337ee20358bf55a0548c669 100644
--- a/pkg/systray/signal_windows.go
+++ b/pkg/systray/signal_windows.go
@@ -17,7 +17,7 @@
 package systray
 
 import (
-	"0xacab.org/leap/bitmask-systray/pkg/bitmask"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
 )
 
 func listenSignals(bm bitmask.Bitmask) {
diff --git a/pkg/systray/systray.go b/pkg/systray/systray.go
index 29e798d59588b59478a9647f432bf32e3e514614..11ed8c39f55788ce85432d0114e0807d33431bb1 100644
--- a/pkg/systray/systray.go
+++ b/pkg/systray/systray.go
@@ -22,9 +22,9 @@ import (
 	"os/signal"
 	"time"
 
-	"0xacab.org/leap/bitmask-systray/icon"
-	"0xacab.org/leap/bitmask-systray/pkg/bitmask"
-	"0xacab.org/leap/bitmask-systray/pkg/config"
+	"0xacab.org/leap/bitmask-vpn/icon"
+	"0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"github.com/getlantern/systray"
 	"github.com/skratchdot/open-golang/open"
 )