diff --git a/Dockerfile b/Dockerfile
index db864ed81..115855034 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,5 +52,5 @@ ENV PILOSA_DATA_DIR /data
 ENV PILOSA_BIND 0.0.0.0:10101
 ENV PILOSA_BIND_GRPC 0.0.0.0:20101
 
-ENTRYPOINT ["/pilosa"]
+ENTRYPOINT ["/featurebase"]
 CMD ["server"]
diff --git a/Dockerfile.pilosa b/Dockerfile.pilosa
index c830a8862..fd8629946 100644
--- a/Dockerfile.pilosa
+++ b/Dockerfile.pilosa
@@ -33,6 +33,7 @@ VOLUME /data
 ENV PILOSA_DATA_DIR /data
 ENV PILOSA_BIND 0.0.0.0:10101
 ENV PILOSA_BIND_GRPC 0.0.0.0:20101
-
-ENTRYPOINT ["/pilosa"]
+RUN echo RUNNING DOCKERFILE.PILOSA
+CMD echo DOCKERFILE.PILOSA
+ENTRYPOINT ["/featurebase"]
 CMD ["server"]
diff --git a/docker-compose-3.yml b/docker-compose-3.yml
index 1998fcf97..ef31424d0 100644
--- a/docker-compose-3.yml
+++ b/docker-compose-3.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   pilosa0:
-    image: build/featurebase                                                                                                                                                     
+    image: build/pilosa                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -25,7 +25,7 @@ services:
       timeout: 5s
       retries: 5
   pilosa1:
-    image: build/featurebase                                                                                                                                                     
+    image: build/pilosa                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -44,7 +44,7 @@ services:
     volumes:
     - data:/data
   pilosa2:
-    image: build/featurebase                                                                                                                                                     
+    image: build/pilosa                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -63,7 +63,7 @@ services:
     volumes:
     - data:/data
   pilosax:
-    image: build/featurebase                                                                                                                                                     
+    image: build/pilosa                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
diff --git a/testBackupRestore.sh b/testBackupRestore.sh
index 8f9617e7f..6d0dbc67f 100755
--- a/testBackupRestore.sh
+++ b/testBackupRestore.sh
@@ -13,19 +13,19 @@ STATUS=$STATUS timeout -s TERM $TIMEOUT bash -c \
     done;'
 echo "NOW DO STUFF"
 datagen --source kitchensink_keyed -e 9999 --pilosa.index sink --pilosa.batch-size 10000 --pilosa.hosts pilosa0:10101
-before=$(/pilosa chksum --host pilosa0:10101)
-/pilosa backup -o backupdir --host pilosa0:10101
+before=$(/featurebase chksum --host pilosa0:10101)
+/featurebase backup -o backupdir --host pilosa0:10101
 curl -X DELETE -s pilosa0:10101/index/sink
-/pilosa restore -s backupdir --host pilosa0:10101
-after=$(/pilosa chksum --host pilosa0:10101)
+/featurebase restore -s backupdir --host pilosa0:10101
+after=$(/featurebase chksum --host pilosa0:10101)
 if [ "$before" = "$after" ]; then
 	echo "PASS Cluster"
 else
 	echo "FAIL Single"
 	exit 1
 fi
-/pilosa restore -s backupdir --host pilosax:10101
-single=$(/pilosa chksum --host pilosax:10101)
+/featurebase restore -s backupdir --host pilosax:10101
+single=$(/featurebase chksum --host pilosax:10101)
 if [ "$before" = "$single" ]; then
 	echo "PASS Single"
 	exit 0