diff --git a/c8000v/Makefile b/c8000v/Makefile
index b2c74b4a..daa054bd 100644
--- a/c8000v/Makefile
+++ b/c8000v/Makefile
@@ -1,11 +1,10 @@
-VENDOR=Cisco
+VENDOR=cisco
 NAME=c8000v
 IMAGE_FORMAT=qcow2
 IMAGE_GLOB=*.qcow2
 
 # match versions like:
-# csr1000v-universalk9.16.03.01a.qcow2
-# csr1000v-universalk9.16.04.01.qcow2
+# c8000v-17.11.01a.qcow2
 VERSION=$(shell echo $(IMAGE) | sed -e 's/.\+[^0-9]\([0-9]\+\.[0-9]\+\.[0-9]\+[a-z]\?\)\([^0-9].*\|$$\)/\1/')
 
 -include ../makefile-sanity.include
@@ -13,6 +12,6 @@ VERSION=$(shell echo $(IMAGE) | sed -e 's/.\+[^0-9]\([0-9]\+\.[0-9]\+\.[0-9]\+[a
 -include ../makefile-install.include
 
 docker-build: docker-build-common
-	docker run --cidfile cidfile --privileged $(REGISTRY)vr-$(VR_NAME):$(VERSION) --trace --install
-	docker commit --change='ENTRYPOINT ["/launch.py"]' $$(cat cidfile) $(REGISTRY)vr-$(VR_NAME):$(VERSION)
+	docker run --cidfile cidfile --privileged $(REGISTRY)$(VENDOR)_$(NAME):$(VERSION) --trace --install
+	docker commit --change='ENTRYPOINT ["/launch.py"]' $$(cat cidfile) $(REGISTRY)$(VENDOR)_$(NAME):$(VERSION)
 	docker rm -f $$(cat cidfile)
diff --git a/csr/Makefile b/csr/Makefile
index 0d40ecaa..4096c798 100644
--- a/csr/Makefile
+++ b/csr/Makefile
@@ -1,5 +1,5 @@
-VENDOR=Cisco
-NAME=CSR1000v
+VENDOR=cisco
+NAME=csr1000v
 IMAGE_FORMAT=qcow2
 IMAGE_GLOB=*.qcow2
 
@@ -16,6 +16,6 @@ docker-pre-build:
 	-rm cidfile
 
 docker-build: docker-build-common
-	docker run --cidfile cidfile --privileged $(REGISTRY)vr-$(VR_NAME):$(VERSION) --trace --install
-	docker commit --change='ENTRYPOINT ["/launch.py"]' $$(cat cidfile) $(REGISTRY)vr-$(VR_NAME):$(VERSION)
+	docker run --cidfile cidfile --privileged $(REGISTRY)$(VENDOR)_$(NAME):$(VERSION) --trace --install
+	docker commit --change='ENTRYPOINT ["/launch.py"]' $$(cat cidfile) $(REGISTRY)$(VENDOR)_$(NAME):$(VERSION)
 	docker rm -f $$(cat cidfile)
diff --git a/makefile.include b/makefile.include
index 81d026af..b1b436e5 100644
--- a/makefile.include
+++ b/makefile.include
@@ -1,5 +1,5 @@
-IMG_NAME=$(shell echo $(NAME) | tr '[:upper:]' '[:lower:]')
-IMG_VENDOR=$(shell echo $(VENDOR) | tr '[:upper:]' '[:lower:]')
+IMG_NAME=$(shell echo $(NAME) | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')
+IMG_VENDOR=$(shell echo $(VENDOR) | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')
 IMAGES=$(shell ls $(IMAGE_GLOB) 2>/dev/null)
 NUM_IMAGES=$(shell ls $(IMAGES) | wc -l)
 VRNETLAB_VERION=$$(git log -1 --format=format:"Commit: %H from %aD")