diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 8c2ee1cb..d311f710 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -450,7 +450,7 @@ spec:
                     } else if (targetPathType.trim() == "dir") {
                       def stashName = artifact.replace('/', '-').replace('.', '-')
                       log.info("Pipeline", "Stashing directory ${artifact} for ${component.name}...")
-                      stash includes: "${artifact}/**", name: "${stashName}-${artifact}"
+                      stash includes: "${artifact}/**", name: "${component.name}-${stashName}"
                     } else {
                       stash includes: artifact, name: "${component.name}-${artifact}"
                     }
@@ -534,7 +534,7 @@ spec:
                     } else {
                       def stashName = artifact.replace('/', '-').replace('.', '-')
                       log.info("Pipeline", "Fetch stashed directory ${artifact} for ${component.name}...")
-                      unstash "${stashName}-${artifact}"
+                      unstash "${component.name}-${stashName}"
                     }
                   }