diff --git a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerFetchRule.groovy b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerFetchRule.groovy
index 01f9176..4b4ec9f 100644
--- a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerFetchRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerFetchRule.groovy
@@ -32,7 +32,7 @@
     }
 
     String getDescription() {
-        'Rule Usage: fetch<image-name>'
+        'Rule Usage: fetch<component-name>'
     }
 
     void apply(String taskName) {
diff --git a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
index 75a5990..2e1a581 100644
--- a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
@@ -32,7 +32,7 @@
     }
 
     String getDescription() {
-        'Rule Usage: publish<image-name>'
+        'Rule Usage: publish<component-name>'
     }
 
     void apply(String taskName) {
@@ -40,7 +40,8 @@
             project.task(taskName, type: DockerPushTask) {
                 ext.compName = taskName - 'publish'
                 dependsOn "tag" + compName
-                repositoryName = compName + ':' + project.targetTag
+                def spec = project.comps[ext.compName]
+                repositoryName = spec.name + ':' + project.targetTag
                 registry = project.targetReg
             }
         }
diff --git a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
index 114bdfc..b48cfb5 100644
--- a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
@@ -32,7 +32,7 @@
     }
 
     String getDescription() {
-        'Rule Usage: tag<image-name>'
+        'Rule Usage: tag<component-name>'
     }
 
     void apply(String taskName) {