diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1
index 9718bc35..57c4675d 100644
--- a/helpers/GenerateResourcesAndImage.ps1
+++ b/helpers/GenerateResourcesAndImage.ps1
@@ -20,10 +20,10 @@ Function Get-PackerTemplatePath {
 
     switch ($ImageType) {
         ([ImageType]::Windows2016) {
-            $relativePath = "\images\win\Windows2016-Azure.json"
+            $relativePath = "\images\win\windows2016.json"
         }
         ([ImageType]::Windows2019) {
-            $relativePath = "\images\win\Windows2019-Azure.json"
+            $relativePath = "\images\win\windows2019.json"
         }
         ([ImageType]::Ubuntu1604) {
             $relativePath = "\images\linux\ubuntu1604.json"
diff --git a/images.CI/linux-and-win/azure-pipelines/windows2016.yml b/images.CI/linux-and-win/azure-pipelines/windows2016.yml
index 39d013f9..0220a38f 100644
--- a/images.CI/linux-and-win/azure-pipelines/windows2016.yml
+++ b/images.CI/linux-and-win/azure-pipelines/windows2016.yml
@@ -16,5 +16,5 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_type: Windows2016-Azure
+    image_type: windows2016
     image_readme_name: Windows2016-Readme.md
\ No newline at end of file
diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml
index 01f65c0e..ccad8f88 100644
--- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml
+++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml
@@ -16,5 +16,5 @@ pr:
 jobs:
 - template: image-generation.yml
   parameters:
-    image_type: Windows2019-Azure
+    image_type: windows2019
     image_readme_name: Windows2019-Readme.md
\ No newline at end of file
diff --git a/images/win/Windows2016-Azure.json b/images/win/windows2016.json
similarity index 100%
rename from images/win/Windows2016-Azure.json
rename to images/win/windows2016.json
diff --git a/images/win/Windows2019-Azure.json b/images/win/windows2019.json
similarity index 100%
rename from images/win/Windows2019-Azure.json
rename to images/win/windows2019.json