diff --git a/apps/gitlab-runner-helper/main.go b/apps/gitlab-runner-helper/main.go
index 9615d6f59d98b12d4d6325542f091b4379fc9ed0..d9380879f945b6c86954e84be9ec4e5fd977426e 100644
--- a/apps/gitlab-runner-helper/main.go
+++ b/apps/gitlab-runner-helper/main.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
 
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands/helpers"
+	_ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers"
 )
 
 func main() {
diff --git a/commands/builds_helper.go b/commands/builds_helper.go
index d1fbfea8832169cd4cd9b3101d2045c56cc0b44a..cc7a89322c440d5753ce3fe074757eb4edd732b2 100644
--- a/commands/builds_helper.go
+++ b/commands/builds_helper.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"sync"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/commands/builds_helper_test.go b/commands/builds_helper_test.go
index 1251fac1d8325780c6a9a89297a9bdce8f12f1cf..b2cb86ac6ab7e301b8af3791d93b6f833f48a79a 100644
--- a/commands/builds_helper_test.go
+++ b/commands/builds_helper_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func TestBuildsHelperCollect(t *testing.T) {
diff --git a/commands/config.go b/commands/config.go
index 78ce5c021c5a3033fc63daab57a8f3bbdbfa4315..3a03ffb0d53fa2661e0fad03357ff8d4f20e853f 100644
--- a/commands/config.go
+++ b/commands/config.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 func getDefaultConfigFile() string {
diff --git a/commands/config_test.go b/commands/config_test.go
index 06eab9b3c38e1e79e532efd45a2cdc431fb5bd61..d0d78c93501378380ef67d091edc3091de1efdf0 100644
--- a/commands/config_test.go
+++ b/commands/config_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type metricsServerTestExample struct {
diff --git a/commands/config_unix.go b/commands/config_unix.go
index 173785ed9b785ab80086c71fd2df7579ce0990fe..4221803ef7cc7a2fcbb957eb8e73485905c1dca9 100644
--- a/commands/config_unix.go
+++ b/commands/config_unix.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 func getDefaultConfigDirectory() string {
diff --git a/commands/config_windows.go b/commands/config_windows.go
index 964cfdb76323c098dabe544ad61b88d020fac7f3..d8959ae899bdc91e7068aab5bf1f2e827fe6aa7b 100644
--- a/commands/config_windows.go
+++ b/commands/config_windows.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 func getDefaultConfigDirectory() string {
diff --git a/commands/exec.go b/commands/exec.go
index 77d4202c9ae9e2cd3f30ecd8c40d754166c17383..71651d8afa1d0362c7d79adfa0e06b3378952356 100644
--- a/commands/exec.go
+++ b/commands/exec.go
@@ -8,15 +8,15 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 	"gitlab.com/ayufan/golang-cli-helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/gitlab_ci_yaml_parser"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/gitlab_ci_yaml_parser"
 
 	// Force to load all executors, executes init() on them
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/parallels"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/shell"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/ssh"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/virtualbox"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/shell"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox"
 )
 
 type ExecCommand struct {
diff --git a/commands/health_helper.go b/commands/health_helper.go
index a4eb2ba59f8d1636c1ddca205276ea16a1b4d30c..35de9f4c7ea6688bc6a5a993b07f64e2a4c8c27d 100644
--- a/commands/health_helper.go
+++ b/commands/health_helper.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type healthData struct {
diff --git a/commands/helpers/artifacts_downloader.go b/commands/helpers/artifacts_downloader.go
index eaf30e0a4b5f9f649f0ef11bf93cd25310111f49..24a13714aa8816b0baeecfdd36e9fbba95586489 100644
--- a/commands/helpers/artifacts_downloader.go
+++ b/commands/helpers/artifacts_downloader.go
@@ -8,10 +8,10 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type ArtifactsDownloaderCommand struct {
diff --git a/commands/helpers/artifacts_downloader_test.go b/commands/helpers/artifacts_downloader_test.go
index d13e14985455cd5ae6ec414028815287d4e1b7d8..29761340338f3953bb2eaaeef957d9882c8ac9fc 100644
--- a/commands/helpers/artifacts_downloader_test.go
+++ b/commands/helpers/artifacts_downloader_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 	"os"
 )
 
diff --git a/commands/helpers/artifacts_test.go b/commands/helpers/artifacts_test.go
index ff6b163b6a25c2607e639977ce1ac4b4fb2ecc24..6d6e705500ad5bee5030b0fb10f4439fdabb03ac 100644
--- a/commands/helpers/artifacts_test.go
+++ b/commands/helpers/artifacts_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 const artifactsTestArchivedFile = "archive_file"
diff --git a/commands/helpers/artifacts_uploader.go b/commands/helpers/artifacts_uploader.go
index 1e39e34e233903c74867806f2b9829fba4a651c1..24640eb9dbc080438d5b1d263bd16b6074cafed5 100644
--- a/commands/helpers/artifacts_uploader.go
+++ b/commands/helpers/artifacts_uploader.go
@@ -10,10 +10,10 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type ArtifactsUploaderCommand struct {
diff --git a/commands/helpers/artifacts_uploader_test.go b/commands/helpers/artifacts_uploader_test.go
index 43541bb4fa3366f5d3dd83d381e5a95e9fe3d0a2..dc8ae571cfbfad73283fd895123da52f66853e1e 100644
--- a/commands/helpers/artifacts_uploader_test.go
+++ b/commands/helpers/artifacts_uploader_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 	"io/ioutil"
 )
 
diff --git a/commands/helpers/cache_archiver.go b/commands/helpers/cache_archiver.go
index c025c2be0fadf1e672186f15dc73f97f29904826..4b38c0fead63ad7d2413d81057fe50f3f2a2f386 100644
--- a/commands/helpers/cache_archiver.go
+++ b/commands/helpers/cache_archiver.go
@@ -10,9 +10,9 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/url"
 )
 
 type CacheArchiverCommand struct {
diff --git a/commands/helpers/cache_archiver_test.go b/commands/helpers/cache_archiver_test.go
index d3b2150189ee99f9e60efca598ff9353c5e98817..259f3fb5b1427d56b5be05d0ad30bbfedc5e62ba 100644
--- a/commands/helpers/cache_archiver_test.go
+++ b/commands/helpers/cache_archiver_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 const cacheArchiverArchive = "archive.zip"
diff --git a/commands/helpers/cache_client.go b/commands/helpers/cache_client.go
index 0404b55f6e6c629e1a518d4a63573266ddee4cb3..a2c19667573f330972b2c475669d29b282d6c193 100644
--- a/commands/helpers/cache_client.go
+++ b/commands/helpers/cache_client.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type CacheClient struct {
diff --git a/commands/helpers/cache_extractor.go b/commands/helpers/cache_extractor.go
index 1e1eaf5210a868e0cee3c4c6a724c3f7cb33fda3..eb7d50bbc191a1a767005ce4219a8d3a00b420b6 100644
--- a/commands/helpers/cache_extractor.go
+++ b/commands/helpers/cache_extractor.go
@@ -12,10 +12,10 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/archives"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/archives"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/url"
 )
 
 type CacheExtractorCommand struct {
diff --git a/commands/helpers/cache_extractor_test.go b/commands/helpers/cache_extractor_test.go
index 2c0cf24f500b6b314e6646b98a1470eb5c5d9dd7..a9f67689949bd1072fb2c8a37c0133fcca0b76e8 100644
--- a/commands/helpers/cache_extractor_test.go
+++ b/commands/helpers/cache_extractor_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 const cacheExtractorArchive = "archive.zip"
diff --git a/commands/list.go b/commands/list.go
index dd657bfdcdf7649502ac32d43e6289913a49c2a4..e207792fc9b5a75e9fb58c3a9ce95479e68d1eda 100644
--- a/commands/list.go
+++ b/commands/list.go
@@ -3,7 +3,7 @@ package commands
 import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type ListCommand struct {
diff --git a/commands/multi.go b/commands/multi.go
index bb4f481b49a1240e8aacb137cdaeb8d6bdd86e5d..045500b48054a970cbadf9064a2dfd1733cbcb62 100644
--- a/commands/multi.go
+++ b/commands/multi.go
@@ -19,13 +19,13 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
-	prometheus_helper "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/prometheus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/sentry"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+	prometheus_helper "gitlab.com/gitlab-org/gitlab-runner/helpers/prometheus"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/sentry"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/service"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type RunCommand struct {
diff --git a/commands/register.go b/commands/register.go
index e9cbb57f62caac4a1656488db5f44b7748714cfd..067ed5f0760c676e09bc6d2403b3cee1f05a1d50 100644
--- a/commands/register.go
+++ b/commands/register.go
@@ -10,9 +10,9 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type RegisterCommand struct {
diff --git a/commands/service.go b/commands/service.go
index 760fbd77fdc8b23b2c647d2e76cea5048e77159d..e23e8ce3f2177743f30b072a2803d0c75f481663 100644
--- a/commands/service.go
+++ b/commands/service.go
@@ -8,9 +8,9 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/ayufan/golang-kardianos-service"
 	"github.com/urfave/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/service"
 )
 
 const (
diff --git a/commands/single.go b/commands/single.go
index 842d9da41e7066df0c22c2a95eed1151c2a38fcf..f1ab85e11ee03236cfd5ba3dd66061626d011035 100644
--- a/commands/single.go
+++ b/commands/single.go
@@ -10,8 +10,8 @@ import (
 	"github.com/tevino/abool"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type RunSingleCommand struct {
diff --git a/commands/single_test.go b/commands/single_test.go
index 5c96a0af1cd002e8a175a036c6cccd7da8df2bfd..d606fb8b2ae63406309a0189a6d23dba7271752a 100644
--- a/commands/single_test.go
+++ b/commands/single_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func init() {
diff --git a/commands/unregister.go b/commands/unregister.go
index 17af5b4633648994a0bfe012c4592c86773a529d..a3d16070698abbd0a3a64cd58c312894edb78353 100644
--- a/commands/unregister.go
+++ b/commands/unregister.go
@@ -4,8 +4,8 @@ import (
 	"github.com/urfave/cli"
 
 	log "github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type UnregisterCommand struct {
diff --git a/commands/verify.go b/commands/verify.go
index 2a0b7d890de4b5d9c7d88c8697d0770b224cc7d8..66d4e9b0eb324e873016c18b2117cdcd08e9da1e 100644
--- a/commands/verify.go
+++ b/commands/verify.go
@@ -6,8 +6,8 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/network"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/network"
 )
 
 type VerifyCommand struct {
diff --git a/common/build.go b/common/build.go
index 762f082657285e2bb6f6718656eaeeda05b12271..e2fab124b50997e86f85626a953342f3a04ac64f 100644
--- a/common/build.go
+++ b/common/build.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type GitStrategy int
diff --git a/common/build_logger.go b/common/build_logger.go
index e175609a66524066db503eb76093fbddfbd415a6..b08797c7f5d374355bda3c576f7c7a65263cb8fb 100644
--- a/common/build_logger.go
+++ b/common/build_logger.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type BuildLogger struct {
diff --git a/common/config.go b/common/config.go
index c603dd36eb83bb51015933f610bec8c9a52a8777..640d634e83efb2818c390ced3337be84b34f269e 100644
--- a/common/config.go
+++ b/common/config.go
@@ -15,10 +15,10 @@ import (
 	"github.com/BurntSushi/toml"
 	log "github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/timeperiod"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/timeperiod"
 )
 
 type DockerPullPolicy string
diff --git a/common/network.go b/common/network.go
index 6606ef1d85a0c96cf16a66fa9b7bac17bf8d420a..4bfb6c4d364774685e04f2042bc1e7761cdb77e7 100644
--- a/common/network.go
+++ b/common/network.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/url"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/url"
 )
 
 type UpdateState int
diff --git a/common/shell.go b/common/shell.go
index 4506b08ce53b0ea8f66698494f1d6884084578a9..a16232f1015872bc3dc8291f625c6b053b7f59c4 100644
--- a/common/shell.go
+++ b/common/shell.go
@@ -3,7 +3,7 @@ package common
 import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type ShellConfiguration struct {
diff --git a/executors/default_executor_provider.go b/executors/default_executor_provider.go
index 692a8d054e495e8407df65124fd9f8b7f885ed9b..716810bb4bf467edd2ad8b80e1c805900cc21fd9 100644
--- a/executors/default_executor_provider.go
+++ b/executors/default_executor_provider.go
@@ -1,6 +1,6 @@
 package executors
 
-import "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+import "gitlab.com/gitlab-org/gitlab-runner/common"
 
 type DefaultExecutorProvider struct {
 	Creator         func() common.Executor
diff --git a/executors/docker/executor_docker.go b/executors/docker/executor_docker.go
index 87b05b9fa4c10f87516eee6e8c0bbe2fa61ca4d7..671d568ce4d626c470e75cf33832c60f783d7bd3 100644
--- a/executors/docker/executor_docker.go
+++ b/executors/docker/executor_docker.go
@@ -20,10 +20,10 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/stdcopy"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	docker_helpers "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	docker_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 
 	"golang.org/x/net/context"
 )
diff --git a/executors/docker/executor_docker_command.go b/executors/docker/executor_docker_command.go
index 7d387b07b8aebf5ee907ae2fd5815f672a3638e9..b0d9c86125dcf8011f3b02872bbf2ff4602d3410 100644
--- a/executors/docker/executor_docker_command.go
+++ b/executors/docker/executor_docker_command.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 
 	"github.com/docker/docker/api/types"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
 )
 
 type commandExecutor struct {
diff --git a/executors/docker/executor_docker_command_test.go b/executors/docker/executor_docker_command_test.go
index 365ad3673e2f769c43d1e59379bdaefbbf7ff164..9329daf144a247e76ce75a3707b8bb932d7915cf 100644
--- a/executors/docker/executor_docker_command_test.go
+++ b/executors/docker/executor_docker_command_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 
 	"golang.org/x/net/context"
 )
diff --git a/executors/docker/executor_docker_ssh.go b/executors/docker/executor_docker_ssh.go
index 6c169df2dd8010b9153e8912fcffda8c9fa0b5d8..6a228d8c0d0f270113c8d706da75f6d13a454599 100644
--- a/executors/docker/executor_docker_ssh.go
+++ b/executors/docker/executor_docker_ssh.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/docker/docker/api/types"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
 )
 
 type sshExecutor struct {
diff --git a/executors/docker/executor_docker_test.go b/executors/docker/executor_docker_test.go
index 009150818566b62f81d45aee7664008de588d940..bf96f8843d4088a858a9bf532d869305c4968e92 100644
--- a/executors/docker/executor_docker_test.go
+++ b/executors/docker/executor_docker_test.go
@@ -18,9 +18,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 
 	"golang.org/x/net/context"
 )
diff --git a/executors/docker/machine/collector_test.go b/executors/docker/machine/collector_test.go
index c6391bce716122f71f5702a6ab5eed51d1533294..f579517c7c245793199efd03fb79716ebe877f0b 100644
--- a/executors/docker/machine/collector_test.go
+++ b/executors/docker/machine/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
diff --git a/executors/docker/machine/details.go b/executors/docker/machine/details.go
index b1b0e64b31fcc48066359c460d75a1549550aef3..b757ae64c86fd877baafe32512215ff95130dbd2 100644
--- a/executors/docker/machine/details.go
+++ b/executors/docker/machine/details.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type machineDetails struct {
diff --git a/executors/docker/machine/details_test.go b/executors/docker/machine/details_test.go
index 298615b33ca2026f9f400e193e6c28ed04749509..add8a0e6543749b26bdea3faf27280e8377ae4c5 100644
--- a/executors/docker/machine/details_test.go
+++ b/executors/docker/machine/details_test.go
@@ -2,7 +2,7 @@ package machine
 
 import (
 	"github.com/stretchr/testify/assert"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 	"testing"
 )
 
diff --git a/executors/docker/machine/executor.go b/executors/docker/machine/executor.go
index 733bb58a4e2f3348c340acfdf6e78bc2aa6be18a..35b932e312d880a7f03caf7966b520cddfa19a6e 100644
--- a/executors/docker/machine/executor.go
+++ b/executors/docker/machine/executor.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 
 	// Force to load docker executor
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
 )
 
 const (
diff --git a/executors/docker/machine/executor_test.go b/executors/docker/machine/executor_test.go
index 6e009b21bb9426ef27dfdc8d3093ab20f4088274..47bb9a20d6a0c28667a9dcce220382c49ea24169 100644
--- a/executors/docker/machine/executor_test.go
+++ b/executors/docker/machine/executor_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 )
 
 func getRunnerConfig() *common.RunnerConfig {
diff --git a/executors/docker/machine/name.go b/executors/docker/machine/name.go
index 383454ef9f1b6d7c0494399e78544b344e33ac3d..6f748b77c5b8afd2caaff0e3fbe447ba0ecc0427 100644
--- a/executors/docker/machine/name.go
+++ b/executors/docker/machine/name.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func machineFormat(runner string, template string) string {
diff --git a/executors/docker/machine/name_test.go b/executors/docker/machine/name_test.go
index d4967d7489bf4e469a8ed5ebf08fd2a93c19ca13..e002307a149ec0859a3f6d3c7df6ff8241642c64 100644
--- a/executors/docker/machine/name_test.go
+++ b/executors/docker/machine/name_test.go
@@ -2,7 +2,7 @@ package machine
 
 import (
 	"github.com/stretchr/testify/assert"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 	"testing"
 )
 
diff --git a/executors/docker/machine/provider.go b/executors/docker/machine/provider.go
index ec2bb4c59f599758c0819f2cf0bf2a2c2216bab6..852796218897a90515e3d48575cf19c3f9ddfb34 100644
--- a/executors/docker/machine/provider.go
+++ b/executors/docker/machine/provider.go
@@ -9,8 +9,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 )
 
 type machineProvider struct {
diff --git a/executors/docker/machine/provider_test.go b/executors/docker/machine/provider_test.go
index 3773dc592435e6bb58510b4e678096463f7c392c..42bcd7144e54f46b0f4598679a46ab2f28f77b77 100644
--- a/executors/docker/machine/provider_test.go
+++ b/executors/docker/machine/provider_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/docker"
 )
 
 var machineDefaultConfig = &common.RunnerConfig{
diff --git a/executors/executor_abstract.go b/executors/executor_abstract.go
index c6eeacf9f5f6ac231a78943fb3d0d95ca8082f88..c8d8578b2e000e4c818055e7a062435fad9368ea 100644
--- a/executors/executor_abstract.go
+++ b/executors/executor_abstract.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type ExecutorOptions struct {
diff --git a/executors/executor_init.go b/executors/executor_init.go
index 5bff067d47c8433c28718813144d958e463aa3f0..46e4f0d5bb5f4821f289b4d27c66977e163045a4 100644
--- a/executors/executor_init.go
+++ b/executors/executor_init.go
@@ -6,5 +6,5 @@ import (
 	// from external packages between 1.4.x and 1.5.x
 	// this import forces to load shells before
 	// and fixes: panic: no shells defined
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells"
+	_ "gitlab.com/gitlab-org/gitlab-runner/shells"
 )
diff --git a/executors/kubernetes/executor_kubernetes.go b/executors/kubernetes/executor_kubernetes.go
index e021ccfa4a505a27c7b4dc9b32dc40ed3517304a..783f3360a53a5bfcb83df883a36a8580a4cf4a85 100644
--- a/executors/kubernetes/executor_kubernetes.go
+++ b/executors/kubernetes/executor_kubernetes.go
@@ -11,8 +11,8 @@ import (
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/credentialprovider"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
 )
 
 var (
diff --git a/executors/kubernetes/executor_kubernetes_test.go b/executors/kubernetes/executor_kubernetes_test.go
index 6d7a89dee5611d5b393aaa47345a11b8ad829ed3..46b3295aeea1743add12e86818b76c61ea54325a 100644
--- a/executors/kubernetes/executor_kubernetes_test.go
+++ b/executors/kubernetes/executor_kubernetes_test.go
@@ -26,9 +26,9 @@ import (
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/fake"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 var (
diff --git a/executors/kubernetes/util.go b/executors/kubernetes/util.go
index b8329efdc118ff4fe2b2bbceca8d1b438f49843b..c56eb098ae7b459cd52d302371e787c6709089a5 100644
--- a/executors/kubernetes/util.go
+++ b/executors/kubernetes/util.go
@@ -15,7 +15,7 @@ import (
 	clientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func init() {
diff --git a/executors/kubernetes/util_test.go b/executors/kubernetes/util_test.go
index 1099755efe4188af077bde0ceeeaf187eb30cf1e..5c30ed88987a19841d0dceb3eab5605948e1e4e7 100644
--- a/executors/kubernetes/util_test.go
+++ b/executors/kubernetes/util_test.go
@@ -15,7 +15,7 @@ import (
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/fake"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func TestGetKubeClientConfig(t *testing.T) {
diff --git a/executors/parallels/executor_parallels.go b/executors/parallels/executor_parallels.go
index eb522215e1ba00952e08740d63a0d103b404dbb4..2b0c0520fe6e93e35b800fa044095f113faf589b 100644
--- a/executors/parallels/executor_parallels.go
+++ b/executors/parallels/executor_parallels.go
@@ -6,11 +6,11 @@ import (
 	"os/exec"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
 
-	prl "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/parallels"
+	prl "gitlab.com/gitlab-org/gitlab-runner/helpers/parallels"
 )
 
 type executor struct {
diff --git a/executors/parallels/executor_parallels_test.go b/executors/parallels/executor_parallels_test.go
index f927cb4212b244973ce76d5f6e01cd267d7fd6a8..b7a2063d73ece730421b8f08929184fd61014ee3 100644
--- a/executors/parallels/executor_parallels_test.go
+++ b/executors/parallels/executor_parallels_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
 )
 
 const prlImage = "ubuntu-runner"
diff --git a/executors/shell/executor_shell.go b/executors/shell/executor_shell.go
index 716f49e11778bda447552849edd976a55c7152ce..d96a5c76ad0cd1bf91c23753c86bf0522fcceaca 100644
--- a/executors/shell/executor_shell.go
+++ b/executors/shell/executor_shell.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
 	"github.com/kardianos/osext"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 	"time"
 )
 
diff --git a/executors/shell/executor_shell_test.go b/executors/shell/executor_shell_test.go
index cb4eeaf2dfcbf58b65da2fe81ef07973d85f462b..33b7cd157909caa1f559c766f0d0fe4500ae9957 100644
--- a/executors/shell/executor_shell_test.go
+++ b/executors/shell/executor_shell_test.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 func onEachShell(t *testing.T, f func(t *testing.T, shell string)) {
diff --git a/executors/ssh/executor_ssh.go b/executors/ssh/executor_ssh.go
index 0864f0b24b734c3177a57e6f96e3455df03bfa13..df80d40c23a016dd49fcc18c64bb57e1aa799fed 100644
--- a/executors/ssh/executor_ssh.go
+++ b/executors/ssh/executor_ssh.go
@@ -3,9 +3,9 @@ package ssh
 import (
 	"errors"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
 )
 
 type executor struct {
diff --git a/executors/virtualbox/executor_virtualbox.go b/executors/virtualbox/executor_virtualbox.go
index ad671f4a3b485e5077ab28e7b2655e5b1f922351..49de53736a2fd767e498b07e7e91753c33199455 100644
--- a/executors/virtualbox/executor_virtualbox.go
+++ b/executors/virtualbox/executor_virtualbox.go
@@ -3,10 +3,10 @@ package virtualbox
 import (
 	"errors"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
-	vbox "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/virtualbox"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/executors"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
+	vbox "gitlab.com/gitlab-org/gitlab-runner/helpers/virtualbox"
 	"time"
 )
 
diff --git a/executors/virtualbox/executor_virtualbox_test.go b/executors/virtualbox/executor_virtualbox_test.go
index 89dc187254ae6a1d5c4182304f37aec906363dcd..38c1b3972161ce401d445d430230f663350bb281 100644
--- a/executors/virtualbox/executor_virtualbox_test.go
+++ b/executors/virtualbox/executor_virtualbox_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/ssh"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/ssh"
 )
 
 const vboxImage = "ubuntu-runner"
diff --git a/helpers/cli/runtime_platform.go b/helpers/cli/runtime_platform.go
index 2cee325968740daa26d335b866dc78d77a9197c9..9b62520e8461c198acd57a4bc874171866788871 100644
--- a/helpers/cli/runtime_platform.go
+++ b/helpers/cli/runtime_platform.go
@@ -3,7 +3,7 @@ package cli_helpers
 import (
 	"runtime"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/helpers/formatter/runner_text_formatter.go b/helpers/formatter/runner_text_formatter.go
index 01595419efc7304ef2347cce84a807033e5c0597..57b93e3c95460922e3f641030a6a0cbce344a3f6 100644
--- a/helpers/formatter/runner_text_formatter.go
+++ b/helpers/formatter/runner_text_formatter.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type RunnerTextFormatter struct {
diff --git a/helpers/gitlab_ci_yaml_parser/data_bag.go b/helpers/gitlab_ci_yaml_parser/data_bag.go
index af46fc9f24ca9801c822d76f3ad4658557b7f2d3..892ce586e687304230a907fa1f7b89c565382aa7 100644
--- a/helpers/gitlab_ci_yaml_parser/data_bag.go
+++ b/helpers/gitlab_ci_yaml_parser/data_bag.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type DataBag map[string]interface{}
diff --git a/helpers/gitlab_ci_yaml_parser/parser.go b/helpers/gitlab_ci_yaml_parser/parser.go
index 9b1744af77b0003963766778167a18c3fbb8431a..ea329156fbc317b6a153b40007d5651b9e8f17f7 100644
--- a/helpers/gitlab_ci_yaml_parser/parser.go
+++ b/helpers/gitlab_ci_yaml_parser/parser.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/helpers/gitlab_ci_yaml_parser/parser_test.go b/helpers/gitlab_ci_yaml_parser/parser_test.go
index d128df3c63bdf07371ac7774aeb199632ea66b13..6a56bf2afe3ea3778e76fb1cd3c2637013f0d3e6 100644
--- a/helpers/gitlab_ci_yaml_parser/parser_test.go
+++ b/helpers/gitlab_ci_yaml_parser/parser_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 var testFile1 = `
diff --git a/helpers/sentry/log_hook.go b/helpers/sentry/log_hook.go
index 1b4c39e912af61d606b9b61aa4ec726c711aafe3..dd2ab8fe009a4d732b86eaf1d5b492dd8cf65361 100644
--- a/helpers/sentry/log_hook.go
+++ b/helpers/sentry/log_hook.go
@@ -9,7 +9,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/getsentry/raven-go"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type LogHook struct {
diff --git a/helpers/service/simple_test.go b/helpers/service/simple_test.go
index b11fd6cad594e01b23afaaea939b9deff9b8aaf6..3791d84a1f29df6b34f1104c14ca61b9b4be9f3d 100644
--- a/helpers/service/simple_test.go
+++ b/helpers/service/simple_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/service/mocks"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/service/mocks"
 )
 
 var errExample = errors.New("example error")
diff --git a/helpers/ssh/ssh_command.go b/helpers/ssh/ssh_command.go
index 46c7448ac0d2a6951ab74de51fed6ed5d820102d..6919fd49eddd94444276eace0f6ba71d177471cd 100644
--- a/helpers/ssh/ssh_command.go
+++ b/helpers/ssh/ssh_command.go
@@ -11,7 +11,7 @@ import (
 
 	"golang.org/x/crypto/ssh"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type Client struct {
diff --git a/main.go b/main.go
index a50e2a6c933e7ea602f64f399eff75e0243f6c37..0bd767b7e18c6e46073ca7a93f5f8f2c6ab834fe 100644
--- a/main.go
+++ b/main.go
@@ -6,20 +6,20 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/cli"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/formatter"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers/formatter"
 
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/commands/helpers"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/machine"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/kubernetes"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/parallels"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/shell"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/ssh"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/virtualbox"
-	_ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells"
+	_ "gitlab.com/gitlab-org/gitlab-runner/commands"
+	_ "gitlab.com/gitlab-org/gitlab-runner/commands/helpers"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/docker"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/docker/machine"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/kubernetes"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/parallels"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/shell"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh"
+	_ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox"
+	_ "gitlab.com/gitlab-org/gitlab-runner/shells"
 )
 
 func main() {
diff --git a/network/client.go b/network/client.go
index 76afaaa7b07024e406695a2df5c766986ea41dc7..e4f754ea2c41e4fd4a55f748d3a0109e3301521f 100644
--- a/network/client.go
+++ b/network/client.go
@@ -24,7 +24,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/jpillora/backoff"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type requestCredentials interface {
diff --git a/network/client_test.go b/network/client_test.go
index 259726ccac68916edff3b10f1200ef0323f81a9a..a2dcd29e7c7b0d53bc41bf6769682306f4d3627c 100644
--- a/network/client_test.go
+++ b/network/client_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	. "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	. "gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func clientHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/network/gitlab.go b/network/gitlab.go
index ba2a4bed3967ee6f4c2a0b6c9865e7df9896a164..4c4b4ca37459973ca5e60454522c655368adfcd2 100644
--- a/network/gitlab.go
+++ b/network/gitlab.go
@@ -15,8 +15,8 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 const clientError = -100
diff --git a/network/gitlab_test.go b/network/gitlab_test.go
index 6aa5d0a8fdae4c18f7fde277a9050a98311e062a..da217cb7ab8723723cffe375617fbdaa1b6e9082 100644
--- a/network/gitlab_test.go
+++ b/network/gitlab_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	. "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	. "gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 var brokenCredentials = RunnerCredentials{
diff --git a/network/trace.go b/network/trace.go
index d5d7cf1a56fe10b19a4ba01e0e9ae0f83744d527..f2a502437d80f1035919f765875fed19e52b854f 100644
--- a/network/trace.go
+++ b/network/trace.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 var traceUpdateInterval = common.UpdateInterval
diff --git a/network/trace_test.go b/network/trace_test.go
index b08d3aa568f3238518306ea1b24276c3294305c8..756e8ae41348feb388b5bc8f229fab3a5363dcd9 100644
--- a/network/trace_test.go
+++ b/network/trace_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 const successID = 4
diff --git a/shells/abstract.go b/shells/abstract.go
index d079540b1355c4c9d6ce41caaf09f5af656230e3..fda74b470ace594606aac5c8b92628efc2f27bcb 100644
--- a/shells/abstract.go
+++ b/shells/abstract.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type AbstractShell struct {
diff --git a/shells/bash.go b/shells/bash.go
index baf1e14da97b24b1d5197ef6228dd3d27edc0cc0..91b2b9f91c1a2182afce04cd7e1bef80b1a02bb2 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -4,8 +4,8 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 	"io"
 	"path"
 	"runtime"
diff --git a/shells/cache.go b/shells/cache.go
index 08d50318442df740bb5cfc4df41d515fe78ea8a6..37abff74508f1ecfc07d8b87bdfd7197b9133c0d 100644
--- a/shells/cache.go
+++ b/shells/cache.go
@@ -13,7 +13,7 @@ import (
 	"github.com/minio/minio-go"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 type bucketLocationTripper struct {
diff --git a/shells/cache_test.go b/shells/cache_test.go
index 9f3f004be2ab9bd9c1c71c7e534f234f128328e4..575ab1cd71eea8e8f3f0d0007bd16b8341a8a2cf 100644
--- a/shells/cache_test.go
+++ b/shells/cache_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
 )
 
 func defaultS3CacheFactory() *common.CacheConfig {
diff --git a/shells/cmd.go b/shells/cmd.go
index 36178e078c32e7a206532d1221eadc7bdf7636fe..af1f3572ad4848b38d821567a59ce81c311df540 100644
--- a/shells/cmd.go
+++ b/shells/cmd.go
@@ -10,8 +10,8 @@ import (
 	"runtime"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type CmdShell struct {
diff --git a/shells/powershell.go b/shells/powershell.go
index 6d44902a1df4506319f743d1c7fa6f249d770d71..aa3e67edb0c622951e30eb4e2a622e53a5f2d429 100644
--- a/shells/powershell.go
+++ b/shells/powershell.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/common"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type PowerShell struct {
diff --git a/shells/shell_writer.go b/shells/shell_writer.go
index 9df9ae0d2eb226e4bce9c7afd65fb879a3b14e8d..cec7c29b64b4a0b3ce58626f3d1737275d13b52a 100644
--- a/shells/shell_writer.go
+++ b/shells/shell_writer.go
@@ -1,6 +1,6 @@
 package shells
 
-import "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+import "gitlab.com/gitlab-org/gitlab-runner/common"
 
 type ShellWriter interface {
 	Variable(variable common.JobVariable)
diff --git a/shells/shell_writer_test.go b/shells/shell_writer_test.go
index cb3a973c1441ed80fe6cdd5e96d555cde52b4537..24a22e822130e78878be812639c8d480c0284014 100644
--- a/shells/shell_writer_test.go
+++ b/shells/shell_writer_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+	"gitlab.com/gitlab-org/gitlab-runner/helpers"
 )
 
 type TestShellWriter interface {