diff --git a/accounts/cmd/ocis-accounts/main.go b/accounts/cmd/accounts/main.go
similarity index 100%
rename from accounts/cmd/ocis-accounts/main.go
rename to accounts/cmd/accounts/main.go
diff --git a/glauth/cmd/ocis-glauth/main.go b/glauth/cmd/glauth/main.go
similarity index 100%
rename from glauth/cmd/ocis-glauth/main.go
rename to glauth/cmd/glauth/main.go
diff --git a/konnectd/cmd/ocis-konnectd/main.go b/konnectd/cmd/konnectd/main.go
similarity index 100%
rename from konnectd/cmd/ocis-konnectd/main.go
rename to konnectd/cmd/konnectd/main.go
diff --git a/ocs/cmd/ocis-ocs/main.go b/ocs/cmd/ocs/main.go
similarity index 100%
rename from ocs/cmd/ocis-ocs/main.go
rename to ocs/cmd/ocs/main.go
diff --git a/proxy/cmd/ocis-proxy/main.go b/proxy/cmd/proxy/main.go
similarity index 100%
rename from proxy/cmd/ocis-proxy/main.go
rename to proxy/cmd/proxy/main.go
diff --git a/settings/cmd/ocis-settings/main.go b/settings/cmd/settings/main.go
similarity index 100%
rename from settings/cmd/ocis-settings/main.go
rename to settings/cmd/settings/main.go
diff --git a/store/cmd/ocis-store/main.go b/store/cmd/store/main.go
similarity index 100%
rename from store/cmd/ocis-store/main.go
rename to store/cmd/store/main.go
diff --git a/thumbnails/cmd/ocis-thumbnails/main.go b/thumbnails/cmd/thumbnails/main.go
similarity index 100%
rename from thumbnails/cmd/ocis-thumbnails/main.go
rename to thumbnails/cmd/thumbnails/main.go
diff --git a/webdav/cmd/ocis-webdav/main.go b/webdav/cmd/webdav/main.go
similarity index 100%
rename from webdav/cmd/ocis-webdav/main.go
rename to webdav/cmd/webdav/main.go