diff --git a/.gitignore b/.gitignore
index 9057da98c..4771e408d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/controller
+/operator
diff --git a/Dockerfile b/Dockerfile
index 47bf1b926..9af824085 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM quay.io/prometheus/busybox:latest
 
-ADD controller /bin/controller
+ADD operator /bin/operator
 
-ENTRYPOINT ["/bin/controller"]
\ No newline at end of file
+ENTRYPOINT ["/bin/operator"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index fe559f964..fd4381bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 build:
-	go build github.com/coreos/kube-prometheus-controller/cmd/controller
+	go build github.com/coreos/prometheus-operator/cmd/operator
 
 container:
-	docker build -t quay.io/coreos/kube-prometheus-controller .
+	docker build -t quay.io/coreos/prometheus-operator.
diff --git a/cmd/controller/main.go b/cmd/operator/main.go
similarity index 94%
rename from cmd/controller/main.go
rename to cmd/operator/main.go
index 0b8d5663b..9e77075ee 100644
--- a/cmd/controller/main.go
+++ b/cmd/operator/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/coreos/kube-prometheus-controller/pkg/controller"
+	"github.com/coreos/prometheus-operator/pkg/controller"
 )
 
 var cfg controller.Config
diff --git a/hack/controller-external.sh b/hack/controller-external.sh
index 29f6a392d..cf5298d76 100755
--- a/hack/controller-external.sh
+++ b/hack/controller-external.sh
@@ -10,4 +10,4 @@ cafile=$(kubectl config view -o jsonpath="{.clusters[?(@.name == \"$1\")].cluste
 certfile=$(kubectl config view -o jsonpath="{.users[?(@.name == \"$1\")].user.client-certificate}")
 keyfile=$(kubectl config view -o jsonpath="{.users[?(@.name == \"$1\")].user.client-key}")
 
-./controller --apiserver=$apiserver --ca-file=$cafile --cert-file=$certfile --key-file=$keyfile
+./operator --apiserver=$apiserver --ca-file=$cafile --cert-file=$certfile --key-file=$keyfile
diff --git a/pkg/controller/client.go b/pkg/controller/client.go
index e073564db..cc51f079a 100644
--- a/pkg/controller/client.go
+++ b/pkg/controller/client.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/coreos/kube-prometheus-controller/pkg/spec"
+	"github.com/coreos/prometheus-operator/pkg/spec"
 	"k8s.io/client-go/1.5/pkg/api"
 	"k8s.io/client-go/1.5/pkg/api/unversioned"
 	"k8s.io/client-go/1.5/pkg/runtime"
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 6638ba04a..821247f23 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/kube-prometheus-controller/pkg/spec"
+	"github.com/coreos/prometheus-operator/pkg/spec"
 
 	"github.com/go-kit/kit/log"
 	"k8s.io/client-go/1.5/kubernetes"
diff --git a/pkg/controller/petset.go b/pkg/controller/petset.go
index d9e17ef12..577b68df3 100644
--- a/pkg/controller/petset.go
+++ b/pkg/controller/petset.go
@@ -3,7 +3,7 @@ package controller
 import (
 	"fmt"
 
-	"github.com/coreos/kube-prometheus-controller/pkg/spec"
+	"github.com/coreos/prometheus-operator/pkg/spec"
 	"k8s.io/client-go/1.5/pkg/api/v1"
 	"k8s.io/client-go/1.5/pkg/apis/apps/v1alpha1"
 	"k8s.io/client-go/1.5/pkg/util/intstr"
diff --git a/pkg/controller/promcfg.go b/pkg/controller/promcfg.go
index 9e82fec74..7a11189d9 100644
--- a/pkg/controller/promcfg.go
+++ b/pkg/controller/promcfg.go
@@ -3,7 +3,7 @@ package controller
 import (
 	"html/template"
 
-	"github.com/coreos/kube-prometheus-controller/pkg/spec"
+	"github.com/coreos/prometheus-operator/pkg/spec"
 )
 
 type templateConfig struct {