builddeploy.patch

diff --git a/Makefile b/Makefile
index 1cd1e89..a36c730 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 REGISTRY         ?= docker.io
 PROJECT          ?= ansibleplaybookbundle
 TAG              ?= latest
-BROKER_APB_IMAGE = $(REGISTRY)/$(PROJECT)/ansible-service-broker-apb
+BROKER_IMAGE = $(REGISTRY)/$(PROJECT)/ansible-service-broker
 BUILD_DIR        = "${GOPATH}/src/github.com/openshift/ansible-service-broker/build"
 
 install: $(shell find cmd pkg)
@@ -24,10 +24,10 @@ prepare-build: install
 	cp "${GOPATH}"/bin/broker build/broker
 
 build: prepare-build
-	docker build ${BUILD_DIR} -t ${BROKER_APB_IMAGE}:${TAG}
+	docker build ${BUILD_DIR} -t ${BROKER_IMAGE}:${TAG}
 	@echo
 	@echo "Remember you need to push your image before calling make deploy"
-	@echo "    docker push ${BROKER_APB_IMAGE}:${TAG}"
+	@echo "    docker push ${BROKER_IMAGE}:${TAG}"
 
 clean:
 	@rm -f ${GOPATH}/bin/broker
diff --git a/ansible-service-broker-all.yaml b/ansible-service-broker-all.yaml
index fc38c92..d796121 100644
--- a/ansible-service-broker-all.yaml
+++ b/ansible-service-broker-all.yaml
@@ -120,7 +120,7 @@ spec:
     spec:
       restartPolicy: Always
       containers:
-        - image: "ansibleplaybookbundle/ansible-service-broker-asb:latest"
+        - image: "ansibleplaybookbundle/ansible-service-broker:latest"
           name: asb
           imagePullPolicy: Always
           ports:
diff --git a/build/Dockerfile b/build/Dockerfile
index 0c47b03..2ddc6a1 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,9 +1,9 @@
 FROM centos:7
 MAINTAINER Ansible Service Broker Community
 
-RUN mkdir /opt/ansibleapp
-RUN useradd -M -b /opt/ansibleapp -s /usr/sbin/nologin -u 1001 -g 0 ansibleapp
-RUN chown -R 1001:0 /opt/ansibleapp
+RUN mkdir /opt/ansibleservicebroker
+RUN useradd -M -b /opt/ansibleservicebroker -s /usr/sbin/nologin -u 1001 -g 0 ansibleservicebroker
+RUN chown -R 1001:0 /opt/ansibleservicebroker
 
 RUN yum -y update \
  && yum -y install epel-release centos-release-openshift-origin \
@@ -16,13 +16,13 @@ RUN mkdir /var/log/ansible-service-broker \
     && mkdir /etc/ansible-service-broker \
     && mkdir -p /usr/local/ansible-service-broker/bin
 
-RUN chown -R ansibleapp: /var/log/ansible-service-broker \
-    && chown -R ansibleapp: /etc/ansible-service-broker
+RUN chown -R ansibleservicebroker: /var/log/ansible-service-broker \
+    && chown -R ansibleservicebroker: /etc/ansible-service-broker
 
 COPY config.yaml /etc/ansible-service-broker/config.yaml
 COPY entrypoint.sh ansible-service-broker /usr/bin/
 COPY broker /usr/bin/asbd
 
-USER ansibleapp
+USER ansibleservicebroker
 
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/templates/broker-deployment_template.yaml b/templates/broker-deployment_template.yaml
index 4233142..40c2705 100644
--- a/templates/broker-deployment_template.yaml
+++ b/templates/broker-deployment_template.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       restartPolicy: Always
       containers:
-        - image: "{{dockerhub_org}}/ansible-service-broker-asb:latest"
+        - image: "{{dockerhub_org}}/ansible-service-broker:latest"
           name: asb
           imagePullPolicy: Always
           ports: