diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index 92db94c..298dd52 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -14,7 +14,7 @@
     id: publish-helm-repo
     name: 'publish-helm-repo'
     description: |
-      Created by publish-helm-repo job-template from ci-management/jjb/helm.yaml
+      Created by publish-helm-repo job-template from ci-management/jjb/charts.yaml
 
     triggers:
       - cord-infra-gerrit-trigger-merge:
@@ -119,7 +119,7 @@
     id: verify-helm-lint
     name: 'verify_{project}_helm-lint'
     description: |
-      Created by verify-helm-lint job-template from ci-management/jjb/lint.yaml
+      Created by verify-helm-lint job-template from ci-management/jjb/charts.yaml
 
     triggers:
       - cord-infra-gerrit-trigger-patchset:
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index eebc39d..d4d7f68 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -20,7 +20,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
                   Copyright (c) 2018 Open Networking Foundation (ONF)
 
@@ -235,7 +235,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Post Tests on {config-pod} triggered by build_{config-pod}_{branch} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by Kailash Khalasi - kailash@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
@@ -307,7 +307,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Post Actions on {config-pod} triggered by build_{config-pod}_{branch}. Service ofagent restart required <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by Kailash Khalasi - kailash@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
@@ -374,7 +374,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
                   Copyright (c) 2018 Open Networking Foundation (ONF)
 
@@ -466,7 +466,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
                   Copyright (c) 2018 Open Networking Foundation (ONF)
 
@@ -568,7 +568,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Post Tests on {config-pod} triggered by build_{config-pod}_{branch} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by Kailash Khalasi - kailash@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
@@ -641,7 +641,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Post Tests on {config-pod} triggered by build_{config-pod}_{branch} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by Kailash Khalasi - kailash@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
@@ -888,7 +888,7 @@
     description: |
                   <!-- Managed by Jenkins Job Builder -->
                   Post Tests on {config-pod} triggered by build_{config-pod}_{branch} <br /><br />
-                  Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
+                  Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
                   Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
diff --git a/jjb/versioning.yaml b/jjb/versioning.yaml
index b69c861..ddefa17 100644
--- a/jjb/versioning.yaml
+++ b/jjb/versioning.yaml
@@ -77,7 +77,7 @@
     id: version-tag
     name: "version-tag"
     description: |
-      Created by {id} job-template from ci-management/jjb/release.yaml
+      Created by {id} job-template from ci-management/jjb/versioning.yaml
       When a patch is merged, check if it contains a SemVer released version
       file and if so tags the commit in git with that same version.