diff --git a/accounts/Makefile b/accounts/Makefile
index c4250c3209..8cd18f0ba2 100644
--- a/accounts/Makefile
+++ b/accounts/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-accounts
-IMPORT := github.com/owncloud/$(NAME)
+NAME := accounts
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/glauth/Makefile b/glauth/Makefile
index 99964e4e10..3205d14dc8 100644
--- a/glauth/Makefile
+++ b/glauth/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-glauth
-IMPORT := github.com/owncloud/$(NAME)
+NAME := glauth
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/konnectd/Makefile b/konnectd/Makefile
index bf2ce4578a..010a8e093b 100644
--- a/konnectd/Makefile
+++ b/konnectd/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-konnectd
-IMPORT := github.com/owncloud/$(NAME)
+NAME := konnectd
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/ocis-phoenix/Makefile b/ocis-phoenix/Makefile
index 81726f99ca..ae41d42a87 100644
--- a/ocis-phoenix/Makefile
+++ b/ocis-phoenix/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := ocis-phoenix
-IMPORT := github.com/owncloud/$(NAME)
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile
index 7d3e08ef72..71462a75ea 100644
--- a/ocis-pkg/Makefile
+++ b/ocis-pkg/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := ocis-pkg
-IMPORT := github.com/owncloud/$(NAME)
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 
diff --git a/ocis-reva/Makefile b/ocis-reva/Makefile
index 3f90d955f2..f252c25da0 100644
--- a/ocis-reva/Makefile
+++ b/ocis-reva/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := ocis-reva
-IMPORT := github.com/owncloud/$(NAME)
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/ocis/Makefile b/ocis/Makefile
index de71607368..fd363bec7f 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := ocis
-IMPORT := github.com/owncloud/$(NAME)
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/ocs/Makefile b/ocs/Makefile
index e950662b7b..0836377eb9 100644
--- a/ocs/Makefile
+++ b/ocs/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-ocs
-IMPORT := github.com/owncloud/$(NAME)
+NAME := ocs
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/proxy/Makefile b/proxy/Makefile
index 9c699b8982..c6a4c54e26 100644
--- a/proxy/Makefile
+++ b/proxy/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-proxy
-IMPORT := github.com/owncloud/$(NAME)
+NAME := proxy
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/settings/Makefile b/settings/Makefile
index 820504c759..736f6b1c1f 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-settings
-IMPORT := github.com/owncloud/$(NAME)
+NAME := settings
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/store/Makefile b/store/Makefile
index c933dd3b13..cad8a5e76d 100644
--- a/store/Makefile
+++ b/store/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-store
-IMPORT := github.com/owncloud/$(NAME)
+NAME := store
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/thumbnails/Makefile b/thumbnails/Makefile
index 10babead34..2a74d01f43 100644
--- a/thumbnails/Makefile
+++ b/thumbnails/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-thumbnails
-IMPORT := github.com/owncloud/$(NAME)
+NAME := thumbnails
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
 HUGO := hugo
diff --git a/webdav/Makefile b/webdav/Makefile
index 54ce477ce8..8a7bf4ab65 100644
--- a/webdav/Makefile
+++ b/webdav/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
-NAME := ocis-webdav
-IMPORT := github.com/owncloud/$(NAME)
+NAME := webdav
+IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist