diff --git a/src/ArmTemplates/Commands/Executors/CreatorExecutor.cs b/src/ArmTemplates/Commands/Executors/CreatorExecutor.cs
index dce9a13f..d6c67c5a 100644
--- a/src/ArmTemplates/Commands/Executors/CreatorExecutor.cs
+++ b/src/ArmTemplates/Commands/Executors/CreatorExecutor.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.FileHandlers;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.Models.Parameters;
@@ -203,9 +204,7 @@ public async Task ExecuteGenerationBasedOnConfiguration()
                 }
             }
 
-            this.logger.LogInformation("Creating tag template");
-            this.logger.LogInformation("------------------------------------------");
-            var tagTemplate = this.creatorParameters.Tags != null ? this.tagTemplateCreator.CreateTagTemplate(this.creatorParameters) : null;
+            var tagTemplate = await this.GenerateTagsTemplateAsync();
 
             // create parameters file
             var templateParameters = this.masterTemplateCreator.CreateMasterTemplateParameterValues(this.creatorParameters);
@@ -242,44 +241,59 @@ public async Task ExecuteGenerationBasedOnConfiguration()
             }
             if (globalServicePolicyTemplate != null)
             {
-                FileWriter.WriteJSONToFile(globalServicePolicyTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.GlobalServicePolicy));
+                FileWriter.WriteJSONToFile(globalServicePolicyTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.GlobalServicePolicy));
             }
             if (apiVersionSetsTemplate != null)
             {
-                FileWriter.WriteJSONToFile(apiVersionSetsTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.ApiVersionSets));
+                FileWriter.WriteJSONToFile(apiVersionSetsTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.ApiVersionSets));
             }
             if (productsTemplate != null)
             {
-                FileWriter.WriteJSONToFile(productsTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Products));
+                FileWriter.WriteJSONToFile(productsTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Products));
             }
             if (productAPIsTemplate != null)
             {
-                FileWriter.WriteJSONToFile(productAPIsTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.ProductAPIs));
+                FileWriter.WriteJSONToFile(productAPIsTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.ProductAPIs));
             }
             if (propertyTemplate != null)
             {
-                FileWriter.WriteJSONToFile(propertyTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.NamedValues));
+                FileWriter.WriteJSONToFile(propertyTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.NamedValues));
             }
             if (loggersTemplate != null)
             {
-                FileWriter.WriteJSONToFile(loggersTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Loggers));
+                FileWriter.WriteJSONToFile(loggersTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Loggers));
             }
             if (backendsTemplate != null)
             {
-                FileWriter.WriteJSONToFile(backendsTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Backends));
+                FileWriter.WriteJSONToFile(backendsTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Backends));
             }
             if (authorizationServersTemplate != null)
             {
-                FileWriter.WriteJSONToFile(authorizationServersTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.AuthorizationServers));
+                FileWriter.WriteJSONToFile(authorizationServersTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.AuthorizationServers));
             }
             if (tagTemplate != null)
             {
-                FileWriter.WriteJSONToFile(tagTemplate, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Tags));
+                FileWriter.WriteJSONToFile(tagTemplate, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Tags));
             }
 
             // write parameters to outputLocation
-            FileWriter.WriteJSONToFile(templateParameters, string.Concat(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Parameters));
+            FileWriter.WriteJSONToFile(templateParameters, Path.Combine(this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Parameters));
             this.logger.LogInformation("Templates written to output location");
         }
+
+        public async Task<Template> GenerateTagsTemplateAsync()
+        {
+            if (this.creatorParameters.Tags.IsNullOrEmpty() && this.creatorParameters.Apis.All(x => x.Tags.IsNullOrEmpty()))
+            {
+                return null;    
+            }
+
+            this.logger.LogInformation("Creating tag template");
+            
+            var tagTemplate = this.tagTemplateCreator.CreateTagTemplate(this.creatorParameters);
+            await FileWriter.SaveAsJsonAsync(tagTemplate, this.creatorParameters.OutputLocation, this.creatorParameters.FileNames.Tags);
+
+            return tagTemplate;
+        }
     }
 }
diff --git a/src/ArmTemplates/Common/Constants/ErrorMessages.cs b/src/ArmTemplates/Common/Constants/ErrorMessages.cs
new file mode 100644
index 00000000..aa3c8dfb
--- /dev/null
+++ b/src/ArmTemplates/Common/Constants/ErrorMessages.cs
@@ -0,0 +1,13 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants
+{
+    public static class ErrorMessages
+    {
+        public const string DuplicateTagResourceNameErrorMessage = "Duplicate tag resource name found during sanitizing the display name. Please consider renaming tags: {0}, {1}. Both resulted resource name to be equal to: {2}";
+        public const string EmptyResourceNameAfterSanitizingErrorMessage = "Sanitizing the display name '{0}' resulted empty string";
+    }
+}
diff --git a/src/ArmTemplates/Common/Exceptions/DuplicateTagResourceNameException.cs b/src/ArmTemplates/Common/Exceptions/DuplicateTagResourceNameException.cs
new file mode 100644
index 00000000..9c23805b
--- /dev/null
+++ b/src/ArmTemplates/Common/Exceptions/DuplicateTagResourceNameException.cs
@@ -0,0 +1,17 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+using System;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Exceptions
+{
+    public class DuplicateTagResourceNameException : Exception
+    {
+        public DuplicateTagResourceNameException(string existingValue, string tagName, string resourceName): base (string.Format(ErrorMessages.DuplicateTagResourceNameErrorMessage, existingValue, tagName, resourceName))
+        {
+        }
+    }
+}
diff --git a/src/ArmTemplates/Common/Exceptions/EmptyResourceNameException.cs b/src/ArmTemplates/Common/Exceptions/EmptyResourceNameException.cs
new file mode 100644
index 00000000..a7aa363e
--- /dev/null
+++ b/src/ArmTemplates/Common/Exceptions/EmptyResourceNameException.cs
@@ -0,0 +1,17 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+using System;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Exceptions
+{
+    public class EmptyResourceNameException : Exception
+    {
+        public EmptyResourceNameException(string resourceName) : base(string.Format(ErrorMessages.EmptyResourceNameAfterSanitizingErrorMessage, resourceName))
+        {
+        }
+    }
+}
diff --git a/src/ArmTemplates/Common/Extensions/CollectionExtensions.cs b/src/ArmTemplates/Common/Extensions/CollectionExtensions.cs
index 119a0bba..8402b584 100644
--- a/src/ArmTemplates/Common/Extensions/CollectionExtensions.cs
+++ b/src/ArmTemplates/Common/Extensions/CollectionExtensions.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions
 {
-    static class CollectionExtensions
+    public static class CollectionExtensions
     {
         public static bool IsNullOrEmpty<T>(this IEnumerable<T> collection)
         {
diff --git a/src/ArmTemplates/Common/Extensions/ParameterNamingHelper.cs b/src/ArmTemplates/Common/Extensions/NamingHelper.cs
similarity index 64%
rename from src/ArmTemplates/Common/Extensions/ParameterNamingHelper.cs
rename to src/ArmTemplates/Common/Extensions/NamingHelper.cs
index ce404bc6..813a27b7 100644
--- a/src/ArmTemplates/Common/Extensions/ParameterNamingHelper.cs
+++ b/src/ArmTemplates/Common/Extensions/NamingHelper.cs
@@ -8,9 +8,10 @@
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions
 {
-    static class ParameterNamingHelper
+    public static class NamingHelper
     {
         static readonly Regex ExcludeOtherFromLettersAndDigitsRegex = new Regex("[^a-zA-Z0-9]");
+        static readonly Regex ExcludeOtherFromAlphaNumericsAndHyphensRegex = new Regex("[^a-zA-Z0-9-]");
 
         public static string GetSubstringBetweenTwoCharacters(char left, char right, string fullString)
         {
@@ -42,5 +43,22 @@ public static string GenerateValidParameterName(string apiName, string prefix)
                 return validApiName;
             }
         }
+
+        public static string GenerateValidResourceNameFromDisplayName(string displayName)
+        {
+            if (string.IsNullOrEmpty(displayName))
+            {
+                return string.Empty;
+            }
+
+            var trimmedDisplayName = displayName.Trim().Replace(" ", "-");
+            var resourceName = ExcludeOtherFromAlphaNumericsAndHyphensRegex.Replace(trimmedDisplayName, string.Empty);
+            return resourceName;
+        }
+
+        public static string GenerateParametrizedResourceName(string parameterName, string resourceName)
+        {
+            return $"[concat(parameters('{parameterName}'), '/{resourceName}')]";
+        }
     }
 }
diff --git a/src/ArmTemplates/Common/Templates/Logger/LoggerTemplateResources.cs b/src/ArmTemplates/Common/Templates/Logger/LoggerTemplateResources.cs
index 259e656f..6071469d 100644
--- a/src/ArmTemplates/Common/Templates/Logger/LoggerTemplateResources.cs
+++ b/src/ArmTemplates/Common/Templates/Logger/LoggerTemplateResources.cs
@@ -51,7 +51,7 @@ public void SetLoggerResourceIdForEachLogger()
         static string GetValidLoggerParamName(string resourceName)
         {
             var loggerNameStrs = resourceName.Split(new char[] { ',' });
-            var validLoggerName = ParameterNamingHelper.GenerateValidParameterName(loggerNameStrs[loggerNameStrs.Length - 1], ParameterPrefix.LogResourceId);
+            var validLoggerName = NamingHelper.GenerateValidParameterName(loggerNameStrs[loggerNameStrs.Length - 1], ParameterPrefix.LogResourceId);
             return validLoggerName;
         }
     }
diff --git a/src/ArmTemplates/Creator/Models/Parameters/CreatorParameters.cs b/src/ArmTemplates/Creator/Models/Parameters/CreatorParameters.cs
index ac1c6111..df48c9e2 100644
--- a/src/ArmTemplates/Creator/Models/Parameters/CreatorParameters.cs
+++ b/src/ArmTemplates/Creator/Models/Parameters/CreatorParameters.cs
@@ -74,7 +74,7 @@ internal void OverrideParameters(CreateConsoleAppConfiguration configuration, Fi
             }
         }
 
-        internal void GenerateFileNames()
+        public void GenerateFileNames()
         {
             this.FileNames = this.BaseFileName == null
                 ? FileNameGenerator.GenerateFileNames(this.ApimServiceName)
diff --git a/src/ArmTemplates/Creator/TemplateCreators/Abstractions/ITagTemplateCreator.cs b/src/ArmTemplates/Creator/TemplateCreators/Abstractions/ITagTemplateCreator.cs
index 36f63c1c..677e7499 100644
--- a/src/ArmTemplates/Creator/TemplateCreators/Abstractions/ITagTemplateCreator.cs
+++ b/src/ArmTemplates/Creator/TemplateCreators/Abstractions/ITagTemplateCreator.cs
@@ -3,11 +3,6 @@
 //  Licensed under the MIT License.
 // --------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.Models.Parameters;
 
diff --git a/src/ArmTemplates/Creator/TemplateCreators/PropertyTemplateCreator.cs b/src/ArmTemplates/Creator/TemplateCreators/PropertyTemplateCreator.cs
index 0c7b1078..085678f3 100644
--- a/src/ArmTemplates/Creator/TemplateCreators/PropertyTemplateCreator.cs
+++ b/src/ArmTemplates/Creator/TemplateCreators/PropertyTemplateCreator.cs
@@ -53,14 +53,14 @@ public Template CreatePropertyTemplate(CreatorParameters creatorConfig)
             {
                 string value = namedValue.Value == null ? null
                    : creatorConfig.ParameterizeNamedValues
-                       ? $"[parameters('{ParameterNames.NamedValues}').{ParameterNamingHelper.GenerateValidParameterName(namedValue.DisplayName, ParameterPrefix.Property)}]"
+                       ? $"[parameters('{ParameterNames.NamedValues}').{NamingHelper.GenerateValidParameterName(namedValue.DisplayName, ParameterPrefix.Property)}]"
                        : namedValue.Value;
 
                 var keyVault = namedValue.KeyVault == null ? null
                     : creatorConfig.ParameterizeNamedValues
                         ? new NamedValueResourceKeyVaultProperties
                         {
-                            SecretIdentifier = $"[parameters('{ParameterNames.NamedValueKeyVaultSecrets}').{ParameterNamingHelper.GenerateValidParameterName(namedValue.DisplayName, ParameterPrefix.Property)}]"
+                            SecretIdentifier = $"[parameters('{ParameterNames.NamedValueKeyVaultSecrets}').{NamingHelper.GenerateValidParameterName(namedValue.DisplayName, ParameterPrefix.Property)}]"
                         }
                         : namedValue.KeyVault;
 
diff --git a/src/ArmTemplates/Creator/TemplateCreators/TagTemplateCreator.cs b/src/ArmTemplates/Creator/TemplateCreators/TagTemplateCreator.cs
index 64aa026e..0155d84c 100644
--- a/src/ArmTemplates/Creator/TemplateCreators/TagTemplateCreator.cs
+++ b/src/ArmTemplates/Creator/TemplateCreators/TagTemplateCreator.cs
@@ -10,6 +10,8 @@
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Builders.Abstractions;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.Models.Parameters;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.TemplateCreators.Abstractions;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Exceptions;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.TemplateCreators
 {
@@ -22,53 +24,71 @@ public TagTemplateCreator(ITemplateBuilder templateBuilder)
             this.templateBuilder = templateBuilder;
         }
 
-        public Template CreateTagTemplate(CreatorParameters creatorConfig)
+        static void AddTagNameToDictionary(string tagName, Dictionary<string, string> tagsDictionary)
         {
-            // create empty template
-            Template tagTemplate = this.templateBuilder.GenerateEmptyTemplate().Build();
+            var resourceName = NamingHelper.GenerateValidResourceNameFromDisplayName(tagName);
 
-            // add parameters
-            tagTemplate.Parameters = new Dictionary<string, TemplateParameterProperties>
+            if (string.IsNullOrEmpty(resourceName)) 
             {
-                {ParameterNames.ApimServiceName, new TemplateParameterProperties(){ Type = "string" }}
-            };
+                throw new EmptyResourceNameException(tagName);
+            }
+
+            if (tagsDictionary.ContainsKey(resourceName))
+            {
+                var existingValue = tagsDictionary[resourceName];
+                if (!existingValue.Equals(tagName))
+                {
+                    throw new DuplicateTagResourceNameException(existingValue, tagName, resourceName);
+                }
+            }
+            else
+            {
+                tagsDictionary.Add(resourceName, tagName);
+            }
+        }
 
-            // aggregate all tags from apis
-            HashSet<string> tagHashset = new HashSet<string>();
-            List<ApiConfig> apis = creatorConfig.Apis;
-            if (apis != null)
+        public Template CreateTagTemplate(CreatorParameters creatorConfig)
+        {
+            var tagTemplate = this.templateBuilder.GenerateTemplateWithApimServiceNameProperty().Build();
+            var tagsDictionary = new Dictionary<string, string>();
+
+            if (!creatorConfig.Apis.IsNullOrEmpty())
             {
-                foreach (ApiConfig api in apis)
+                foreach (var api in creatorConfig.Apis)
                 {
-                    if (api.Tags != null)
+                    if (!api.Tags.IsNullOrEmpty())
                     {
-                        string[] apiTags = api.Tags.Split(", ");
-                        foreach (string apiTag in apiTags)
+                        var apiTags = api.Tags.Split(",");
+                        
+                        foreach (var apiTag in apiTags)
                         {
-                            tagHashset.Add(apiTag);
+                            AddTagNameToDictionary(apiTag, tagsDictionary);
                         }
                     }
                 }
             }
-            foreach (TagProperties tag in creatorConfig.Tags)
+
+            if (!creatorConfig.Tags.IsNullOrEmpty())
             {
-                tagHashset.Add(tag.DisplayName);
+                foreach (var tag in creatorConfig.Tags)
+                {
+                    AddTagNameToDictionary(tag.DisplayName, tagsDictionary);
+                }
             }
 
-            List<TemplateResource> resources = new List<TemplateResource>();
-            foreach (string tag in tagHashset)
+            var resources = new List<TemplateResource>();
+
+            foreach (var (tagResourceName, tagDisplayName) in tagsDictionary)
             {
-                // create tag resource with properties
-                TagTemplateResource tagTemplateResource = new TagTemplateResource()
+                var tagTemplateResource = new TagTemplateResource()
                 {
-                    Name = $"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{tag}')]",
+                    Name = NamingHelper.GenerateParametrizedResourceName(ParameterNames.ApimServiceName, tagResourceName),
                     Type = ResourceTypeConstants.Tag,
                     ApiVersion = GlobalConstants.ApiVersion,
                     Properties = new TagProperties()
                     {
-                        DisplayName = tag
-                    },
-                    DependsOn = new string[] { }
+                        DisplayName = tagDisplayName
+                    }
                 };
                 resources.Add(tagTemplateResource);
             }
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/APIExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/APIExtractor.cs
index 05206d20..24b29e2d 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/APIExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/APIExtractor.cs
@@ -142,14 +142,14 @@ void SetArmTemplateValuesToApiTemplateResource(ApiTemplateResource apiResource,
 
             if (extractorParameters.ParameterizeServiceUrl)
             {
-                apiResource.Properties.ServiceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{ParameterNamingHelper.GenerateValidParameterName(originalServiceApiName, ParameterPrefix.Api)}]";
+                apiResource.Properties.ServiceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{NamingHelper.GenerateValidParameterName(originalServiceApiName, ParameterPrefix.Api)}]";
             }
 
             if (extractorParameters.ParametrizeApiOauth2Scope)
             {
                 if (apiResource.Properties.AuthenticationSettings?.OAuth2?.Scope is not null)
                 {
-                    apiResource.Properties.AuthenticationSettings.OAuth2.Scope = $"[parameters('{ParameterNames.ApiOauth2ScopeSettings}').{ParameterNamingHelper.GenerateValidParameterName(originalServiceApiName, ParameterPrefix.ApiOauth2Scope)}]";
+                    apiResource.Properties.AuthenticationSettings.OAuth2.Scope = $"[parameters('{ParameterNames.ApiOauth2ScopeSettings}').{NamingHelper.GenerateValidParameterName(originalServiceApiName, ParameterPrefix.ApiOauth2Scope)}]";
                 }
             }
 
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/ApiRevisionExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/ApiRevisionExtractor.cs
index 031daa96..af4834b7 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/ApiRevisionExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/ApiRevisionExtractor.cs
@@ -118,7 +118,7 @@ async Task<ApiTemplateResource> GenerateApiTemplateResourceAsVersioned(string ap
 
             if (extractorParameters.ParameterizeServiceUrl)
             {
-                apiDetails.Properties.ServiceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{ParameterNamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api)}]";
+                apiDetails.Properties.ServiceUrl = $"[parameters('{ParameterNames.ServiceUrl}').{NamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api)}]";
             }
 
             if (apiDetails.Properties.ApiVersionSetId != null)
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/BackendExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/BackendExtractor.cs
index a5e3fb77..d7208e36 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/BackendExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/BackendExtractor.cs
@@ -110,7 +110,7 @@ void SaveBackendApiParametersToCache()
                     }
 
                     var backendApiParameters = new BackendApiParameters();
-                    var backendValidName = ParameterNamingHelper.GenerateValidParameterName(originalBackendName, ParameterPrefix.Backend).ToLower();
+                    var backendValidName = NamingHelper.GenerateValidParameterName(originalBackendName, ParameterPrefix.Backend).ToLower();
 
                     if (!string.IsNullOrEmpty(backendResource.Properties.ResourceId))
                     {
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/DiagnosticExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/DiagnosticExtractor.cs
index 90525bd9..018b0f04 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/DiagnosticExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/DiagnosticExtractor.cs
@@ -52,7 +52,7 @@ public async Task<List<DiagnosticTemplateResource>> GetApiDiagnosticsResourcesAs
 
                 if (extractorParameters.ParameterizeApiLoggerId)
                 {
-                    apiDiagnostic.Properties.LoggerId = $"[parameters('{ParameterNames.ApiLoggerId}').{ParameterNamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api)}.{ParameterNamingHelper.GenerateValidParameterName(apiDiagnosticOriginalName, ParameterPrefix.Diagnostic)}]";
+                    apiDiagnostic.Properties.LoggerId = $"[parameters('{ParameterNames.ApiLoggerId}').{NamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api)}.{NamingHelper.GenerateValidParameterName(apiDiagnosticOriginalName, ParameterPrefix.Diagnostic)}]";
                 }
 
                 if (!apiDiagnosticOriginalName.Contains("applicationinsights"))
@@ -95,7 +95,7 @@ public async Task<List<DiagnosticTemplateResource>> GetServiceDiagnosticsTemplat
 
                 if (extractorParameters.ParameterizeApiLoggerId)
                 {
-                    serviceDiagnostic.Properties.LoggerId = $"[parameters('{ParameterNames.ApiLoggerId}').{ParameterNamingHelper.GenerateValidParameterName(originalDiagnosticName, ParameterPrefix.Diagnostic)}]";
+                    serviceDiagnostic.Properties.LoggerId = $"[parameters('{ParameterNames.ApiLoggerId}').{NamingHelper.GenerateValidParameterName(originalDiagnosticName, ParameterPrefix.Diagnostic)}]";
                 }
 
                 if (!originalDiagnosticName.Contains("applicationinsights"))
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/LoggerExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/LoggerExtractor.cs
index 61c27cf1..e7b9c16f 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/LoggerExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/LoggerExtractor.cs
@@ -76,14 +76,14 @@ public async Task<Template<LoggerTemplateResources>> GenerateLoggerTemplateAsync
                     var isReferencedInPolicy = apiPolicies?.Any(x => x.Properties.PolicyContent.Contains(originalLoggerName));
                     
                     bool isReferencedInDiagnostic = false;
-                    var validApiName = ParameterNamingHelper.GenerateValidParameterName(apisToExtract.First(), ParameterPrefix.Api);
+                    var validApiName = NamingHelper.GenerateValidParameterName(apisToExtract.First(), ParameterPrefix.Api);
                     if (extractorParameters.ParameterizeApiLoggerId && this.Cache.ApiDiagnosticLoggerBindings.ContainsKey(validApiName))
                     {
                         var diagnosticLoggerBindings = this.Cache.ApiDiagnosticLoggerBindings[validApiName];
                         
                         if (!diagnosticLoggerBindings.IsNullOrEmpty())
                         {
-                            var validDiagnosticName = ParameterNamingHelper.GenerateValidParameterName(logger.Properties.LoggerType, ParameterPrefix.Diagnostic).ToLower();
+                            var validDiagnosticName = NamingHelper.GenerateValidParameterName(logger.Properties.LoggerType, ParameterPrefix.Diagnostic).ToLower();
                             if (diagnosticLoggerBindings.Any(x => x.DiagnosticName == validDiagnosticName))
                             {
                                 isReferencedInDiagnostic = true;
@@ -112,7 +112,7 @@ async Task LoadAllReferencedLoggers(
             {
                 string loggerId = serviceDiagnostic.Properties.LoggerId;
 
-                var serviceDiagnosticsKey = ParameterNamingHelper.GenerateValidParameterName(serviceDiagnostic.Name, ParameterPrefix.Diagnostic);
+                var serviceDiagnosticsKey = NamingHelper.GenerateValidParameterName(serviceDiagnostic.Name, ParameterPrefix.Diagnostic);
 
                 if (!this.Cache.ServiceLevelDiagnosticLoggerBindings.ContainsKey(serviceDiagnosticsKey))
                 {
@@ -141,7 +141,7 @@ async Task LoadAllReferencedLoggers(
                 {
                     diagnosticLoggerBindings.Add(new DiagnosticLoggerBinding
                     {
-                        DiagnosticName = ParameterNamingHelper.GenerateValidParameterName(diagnostic.Name, ParameterPrefix.Diagnostic),
+                        DiagnosticName = NamingHelper.GenerateValidParameterName(diagnostic.Name, ParameterPrefix.Diagnostic),
                         LoggerId = diagnostic.Properties.LoggerId
                     });
                 }
@@ -149,7 +149,7 @@ async Task LoadAllReferencedLoggers(
                 if (!diagnosticLoggerBindings.IsNullOrEmpty())
                 {
                     this.Cache.ApiDiagnosticLoggerBindings.Add(
-                        ParameterNamingHelper.GenerateValidParameterName(curApiName, ParameterPrefix.Api), 
+                        NamingHelper.GenerateValidParameterName(curApiName, ParameterPrefix.Api), 
                         diagnosticLoggerBindings);
                 }
             }
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/NamedValuesExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/NamedValuesExtractor.cs
index b0daba05..30058021 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/NamedValuesExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/NamedValuesExtractor.cs
@@ -82,7 +82,7 @@ public async Task<Template<NamedValuesResources>> GenerateNamedValuesTemplateAsy
 
                 if (extractorParameters.ParameterizeNamedValue)
                 {
-                    namedValueResource.Properties.Value = $"[parameters('{ParameterNames.NamedValues}').{ParameterNamingHelper.GenerateValidParameterName(originalNamedValueName, ParameterPrefix.Property)}]";
+                    namedValueResource.Properties.Value = $"[parameters('{ParameterNames.NamedValues}').{NamingHelper.GenerateValidParameterName(originalNamedValueName, ParameterPrefix.Property)}]";
                 }
 
                 //Hide the value field if it is a keyvault named value
@@ -93,7 +93,7 @@ public async Task<Template<NamedValuesResources>> GenerateNamedValuesTemplateAsy
 
                 if (namedValueResource.Properties.KeyVault != null && extractorParameters.ParamNamedValuesKeyVaultSecrets)
                 {
-                    namedValueResource.Properties.KeyVault.SecretIdentifier = $"[parameters('{ParameterNames.NamedValueKeyVaultSecrets}').{ParameterNamingHelper.GenerateValidParameterName(originalNamedValueName, ParameterPrefix.Property)}]";
+                    namedValueResource.Properties.KeyVault.SecretIdentifier = $"[parameters('{ParameterNames.NamedValueKeyVaultSecrets}').{NamingHelper.GenerateValidParameterName(originalNamedValueName, ParameterPrefix.Property)}]";
                 }
 
                 if (string.IsNullOrEmpty(singleApiName))
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/ParametersExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/ParametersExtractor.cs
index 66193c81..8a97fb6b 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/ParametersExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/ParametersExtractor.cs
@@ -101,7 +101,7 @@ async Task AddServiceUrlParameterAsync()
                 var serviceUrls = new Dictionary<string, string>();
                 foreach (var apiName in apisToExtract)
                 {
-                    var validApiName = ParameterNamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api);
+                    var validApiName = NamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api);
 
                     string serviceUrl = null;
                     if (extractorParameters.ApiParameters is null)
@@ -138,7 +138,7 @@ async Task AddApiOauth2ScopeParameterAsync()
                     if (apiDetails.Properties.AuthenticationSettings?.OAuth2 is not null)
                     {
                         string apiOAuthScope = null;
-                        var validApiName = ParameterNamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api);
+                        var validApiName = NamingHelper.GenerateValidParameterName(apiName, ParameterPrefix.Api);
 
                         if (extractorParameters.ApiParameters.IsNullOrEmpty())
                         {
@@ -174,14 +174,14 @@ void AddNamedValuesParameters()
                     if (extractorParameters.ParameterizeNamedValue && namedValue?.Properties.KeyVault == null)
                     {
                         var propertyValue = namedValue.Properties.Value;
-                        var validPName = ParameterNamingHelper.GenerateValidParameterName(namedValue.OriginalName, ParameterPrefix.Property);
+                        var validPName = NamingHelper.GenerateValidParameterName(namedValue.OriginalName, ParameterPrefix.Property);
                         namedValuesParameters.Add(validPName, propertyValue);
                     }
 
                     if (extractorParameters.ParamNamedValuesKeyVaultSecrets && namedValue?.Properties.KeyVault is not null)
                     {
                         var propertyValue = namedValue.Properties.KeyVault.SecretIdentifier;
-                        var validPName = ParameterNamingHelper.GenerateValidParameterName(namedValue.OriginalName, ParameterPrefix.Property);
+                        var validPName = NamingHelper.GenerateValidParameterName(namedValue.OriginalName, ParameterPrefix.Property);
                         keyVaultNamedValues.Add(validPName, propertyValue);
                     }
                 }
diff --git a/src/ArmTemplates/Extractor/EntityExtractors/PolicyExtractor.cs b/src/ArmTemplates/Extractor/EntityExtractors/PolicyExtractor.cs
index 732888b4..68d6bb3b 100644
--- a/src/ArmTemplates/Extractor/EntityExtractors/PolicyExtractor.cs
+++ b/src/ArmTemplates/Extractor/EntityExtractors/PolicyExtractor.cs
@@ -74,7 +74,7 @@ public string GetCachedPolicyContent(PolicyTemplateResource policyTemplateResour
             if (policyContent.Contains(".xml"))
             {
                 var fileNameSection = policyContent.Split(',')[1];
-                var policyFileName = ParameterNamingHelper.GetSubstringBetweenTwoCharacters('\'', '\'', fileNameSection);
+                var policyFileName = NamingHelper.GetSubstringBetweenTwoCharacters('\'', '\'', fileNameSection);
                 var policyFileFullPath = Path.Combine(baseFilesGenerationDirectory, PoliciesDirectoryName, policyFileName);
 
                 if (File.Exists(policyFileFullPath))
diff --git a/src/README.md b/src/README.md
index f6082713..d09b1f80 100644
--- a/src/README.md
+++ b/src/README.md
@@ -169,6 +169,30 @@ _Additional properties found in [APITemplateSubscriptionKeyParameterNames](https
 
 
 
+### Sanitizing tags
+
+While creating config file, please keep in mind that the tag resource name will be generated from sanitized tag's display name.
+
+For example config:
+
+```
+tags: 
+ - displayName: tag 1
+ - displayName: tag 2
+```
+Will result two tag resources:
+```
+Tag 1:
+  resource name = tag-1
+  display name = tag 1
+
+Tag 2:
+  resource name = tag-2
+  display name = tag 2
+```
+
+In case there are two different tags which result the same sanitized tag's name program will throw an **exception** with conflicting tags.  
+
 ### Sample Config File
 
 The following is a full config.yml file with each property listed:
diff --git a/tests/ArmTemplates.Tests/Common/ExtensionsTest.cs b/tests/ArmTemplates.Tests/Common/ExtensionsTest.cs
new file mode 100644
index 00000000..d5230427
--- /dev/null
+++ b/tests/ArmTemplates.Tests/Common/ExtensionsTest.cs
@@ -0,0 +1,43 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+using Xunit;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions;
+using FluentAssertions;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Common
+{
+    [Trait("Category", "Creator Extensions")]
+    public class ExtensionsTest
+    {
+        [Fact]
+        public void GenerateValidResourceNameFromDisplayName_ShouldReturnEmptyString_GivenEmptyString() 
+        {
+            var resourceName = NamingHelper.GenerateValidResourceNameFromDisplayName(string.Empty);
+
+            resourceName.Should().BeEmpty();
+        }
+
+        [Fact]
+        public void GenerateValidResourceNameFromDisplayName_ShouldReturnSameValue_GivenValidResourceName()
+        {
+            var displayName = "valid-resource-name";
+            var resourceName = NamingHelper.GenerateValidResourceNameFromDisplayName(displayName);
+
+            resourceName.Equals(displayName).Should().BeTrue();
+        }
+
+        [Fact]
+        public void GenerateValidResourceNameFromDisplayName_ShouldReturValidaResourceName_GivenNonResoucreNameDisplayName()
+        {
+            var displayName = "   valid %%resource $$name-   ";
+            var expectedResourceName = "valid-resource-name-";
+            
+            var resourceName = NamingHelper.GenerateValidResourceNameFromDisplayName(displayName);
+
+            resourceName.Equals(expectedResourceName).Should().BeTrue();
+        }
+    }
+}
diff --git a/tests/ArmTemplates.Tests/Creator/Abstraction/CreatorMockerWithOutputTestsBase.cs b/tests/ArmTemplates.Tests/Creator/Abstraction/CreatorMockerWithOutputTestsBase.cs
new file mode 100644
index 00000000..56d85689
--- /dev/null
+++ b/tests/ArmTemplates.Tests/Creator/Abstraction/CreatorMockerWithOutputTestsBase.cs
@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+using System.IO;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Extractor.Abstractions
+{
+    public abstract class CreatorMockerWithOutputTestsBase : TestsBase
+    {
+        protected const string TESTS_OUTPUT_DIRECTORY = "tests-output\\creator";
+        protected string OutputDirectory;
+        
+        protected CreatorMockerWithOutputTestsBase(string outputDirectoryName)
+        {
+            this.OutputDirectory = Path.Combine(TESTS_OUTPUT_DIRECTORY, outputDirectoryName);
+
+            // remember to clean up the output directory before each test
+            if (Directory.Exists(this.OutputDirectory))
+            {
+                Directory.Delete(this.OutputDirectory, true);
+            }
+        }
+    }
+}
diff --git a/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/CreatorExecutorTests.cs b/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/CreatorExecutorTests.cs
new file mode 100644
index 00000000..5080af86
--- /dev/null
+++ b/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/CreatorExecutorTests.cs
@@ -0,0 +1,54 @@
+// --------------------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+//  Licensed under the MIT License.
+// --------------------------------------------------------------------------
+
+using Xunit;
+using System.Collections.Generic;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.TemplateCreators;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Builders;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.Models.Parameters;
+using FluentAssertions;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Commands.Executors;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Extractor.Abstractions;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Creator.TemplateCreatorTests
+{
+    [Trait("Category", "Creator teamplate execution")]
+    public class CreatorExecutorTests : CreatorMockerWithOutputTestsBase
+    {
+        public CreatorExecutorTests() : base("creator-executor-test")
+        {
+        }
+
+        [Fact]
+        public async Task GenerateTagsTemplate_ShouldCreateTemplateFromCreatorConfig_GivenOnlyApiTagsAndConfigTags()
+        {
+            var tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
+            var creatorConfig = new CreatorParameters();
+
+            creatorConfig.Apis = new List<ApiConfig>();
+            var apiConfig = new ApiConfig
+            {
+                Tags = "tag 1"
+            };
+            creatorConfig.Apis.Add(apiConfig);
+            creatorConfig.GenerateFileNames();
+
+            var currentTestDirectory = Path.Combine(this.OutputDirectory, nameof(GenerateTagsTemplate_ShouldCreateTemplateFromCreatorConfig_GivenOnlyApiTagsAndConfigTags));
+            creatorConfig.OutputLocation = currentTestDirectory;
+
+            var creatorExecutor = CreatorExecutor.BuildCreatorExecutor(this.GetTestLogger<CreatorExecutor>(), null, tagTemplateCreator: tagTemplateCreator);
+            creatorExecutor.SetCreatorParameters(creatorConfig);
+            
+            //act
+            var tagTemplate = await creatorExecutor.GenerateTagsTemplateAsync();
+
+            //assert
+            tagTemplate.Should().NotBeNull();
+            File.Exists(Path.Combine(currentTestDirectory, creatorConfig.FileNames.Tags)).Should().BeTrue();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/TagTemplateCreatorTests.cs b/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/TagTemplateCreatorTests.cs
index 1f103a83..4e60c1ae 100644
--- a/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/TagTemplateCreatorTests.cs
+++ b/tests/ArmTemplates.Tests/Creator/TemplateCreatorTests/TagTemplateCreatorTests.cs
@@ -10,28 +10,170 @@
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Templates.Builders;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Constants;
 using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Creator.Models.Parameters;
+using System.Linq;
+using FluentAssertions;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Exceptions;
+using Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common.Extensions;
+using System;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Creator.TemplateCreatorTests
 {
+    [Trait("Category", "Tag Template Creation")]
     public class TagTemplateCreatorTests
     {
+        CreatorParameters GenerateCreatorParameters(List<string> tagNames = null, List<string> apiTagNames = null)
+        {
+            var creatorConfig = new CreatorParameters();
+
+            if (!tagNames.IsNullOrEmpty())
+            {
+                creatorConfig.Tags = new List<TagProperties>();
+                foreach (var tagName in tagNames)
+                {
+                    var tag = new TagProperties
+                    {
+                        DisplayName = tagName
+                    };
+                    creatorConfig.Tags.Add(tag);
+                }
+            }
+
+            if (!apiTagNames.IsNullOrEmpty())
+            {
+                creatorConfig.Apis = new List<ApiConfig>();
+                var apiTagNamesString = string.Join(",", apiTagNames.ToArray());
+
+                var apiConfig = new ApiConfig
+                {
+                    Tags = apiTagNamesString
+                };
+
+                creatorConfig.Apis.Add(apiConfig);
+            }
+
+            return creatorConfig;
+        }
+
         [Fact]
-        public void ShouldCreateTagFromCreatorConfig()
+        public void CreateTagTemplate_ShouldCreateTemplateFromCreatorConfig_GivenApiTagsAndConfigTags()
         {
-            TagTemplateCreator tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
-            CreatorParameters creatorConfig = new CreatorParameters() { Tags = new List<TagProperties>() };
-            TagProperties tag = new TagProperties()
+            var tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
+            
+            var tagNames = new List<string>()
+            {
+                "tag 1", "tag2", "tag 3", "tag2"
+            };
+            var apiTagNames = new List<string>()
             {
-                DisplayName = "displayName"
+                "tag 1", "tag2", "api tag 3", "api tag2"
+            };
+
+            var creatorConfig = this.GenerateCreatorParameters(tagNames, apiTagNames);
+
+            var expectedTagsDictionary = new Dictionary<string, string>()
+            {
+                { "tag-1", "tag 1" },
+                { "tag2", "tag2" },
+                { "tag-3" , "tag 3" },
+                { "api-tag-3", "api tag 3" },
+                { "api-tag2", "api tag2" }
             };
-            creatorConfig.Tags.Add(tag);
 
             //act
             var tagTemplate = tagTemplateCreator.CreateTagTemplate(creatorConfig);
-            var tagTemplateResource = (TagTemplateResource)tagTemplate.Resources[0];
 
             //assert
-            Assert.Equal($"[concat(parameters('{ParameterNames.ApimServiceName}'), '/{tag.DisplayName}')]", tagTemplateResource.Name);
+            tagTemplate.Parameters.Count().Should().Be(1);
+            tagTemplate.Parameters.ContainsKey(ParameterNames.ApimServiceName).Should().BeTrue();
+            tagTemplate.Resources.Count().Should().Be(5);
+
+            var resourcesDictionary = new Dictionary<string, TagTemplateResource>();
+            foreach (TagTemplateResource tag in tagTemplate.Resources)
+            {
+                resourcesDictionary[tag.Name] = tag;
+            }
+
+            foreach (var (tagName, tagDisplayName) in expectedTagsDictionary) 
+            {
+                var resourceName = NamingHelper.GenerateParametrizedResourceName(ParameterNames.ApimServiceName, tagName);
+                resourcesDictionary.Should().ContainKey(resourceName);
+                var tagResource = resourcesDictionary[resourceName];
+                tagResource.Properties.DisplayName.Equals(tagDisplayName).Should().BeTrue();
+            }
+        }
+
+        [Fact]
+        public void CreateTagTemplate_ShouldCreateTemplateFromCreatorConfig_GivenOnlyApiTags()
+        {
+            var tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
+
+            var apiTagNames = new List<string>()
+            {
+                "tag 1", "tag2", "api tag 3", "api tag2"
+            };
+            var creatorConfig = this.GenerateCreatorParameters(apiTagNames: apiTagNames);
+
+            var expectedTagsDictionary = new Dictionary<string, string>()
+            {
+                { "tag-1", "tag 1" },
+                { "tag2", "tag2" },
+                { "api-tag-3", "api tag 3" },
+                { "api-tag2", "api tag2" }
+            };
+
+            //act
+            var tagTemplate = tagTemplateCreator.CreateTagTemplate(creatorConfig);
+
+            //assert
+            tagTemplate.Resources.Count().Should().Be(4);
+
+            var resourcesDictionary = new Dictionary<string, TagTemplateResource>();
+            foreach (TagTemplateResource tag in tagTemplate.Resources)
+            {
+                resourcesDictionary[tag.Name] = tag;
+            }
+
+            foreach (var (tagName, tagDisplayName) in expectedTagsDictionary)
+            {
+                var resourceName = NamingHelper.GenerateParametrizedResourceName(ParameterNames.ApimServiceName, tagName);
+                resourcesDictionary.Should().ContainKey(resourceName);
+                var tagResource = resourcesDictionary[resourceName];
+                tagResource.Properties.DisplayName.Equals(tagDisplayName).Should().BeTrue();
+            }
+        }
+
+        [Fact]
+        public void CreateTagTemplate_ShouldThrowDuplicateTagResourceNameException_GivenDuplicateSanitizedDisplayName()
+        {
+            var tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
+
+            var tagNames= new List<string>()
+            {
+                "tag 1?", "?tag 1?"
+            };
+
+            var creatorConfig = this.GenerateCreatorParameters(tagNames: tagNames);
+
+            //act & assert
+            Action act = () => tagTemplateCreator.CreateTagTemplate(creatorConfig);
+            act.Should().Throw<DuplicateTagResourceNameException>().WithMessage(string.Format(ErrorMessages.DuplicateTagResourceNameErrorMessage, "tag 1?", "?tag 1?", "tag-1"));
+        }
+
+        [Fact]
+        public void CreateTagTemplate_ShouldThrowEmptyResourceNameAfterSanitizingErrorMessage_GivenOneEmptyTag()
+        {
+            var tagTemplateCreator = new TagTemplateCreator(new TemplateBuilder());
+
+            var apiTagNames = new List<string>()
+            {
+                "tag 1", "tag2", "api tag 3", " "
+            };
+            var creatorConfig = this.GenerateCreatorParameters(apiTagNames: apiTagNames);
+
+
+            //act & assert
+            Action act = () => tagTemplateCreator.CreateTagTemplate(creatorConfig);
+            act.Should().Throw<EmptyResourceNameException>().WithMessage(string.Format(ErrorMessages.EmptyResourceNameAfterSanitizingErrorMessage, " "));
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ArmTemplates.Tests/Extractor/Abstractions/ExtractorMockerWithOutputTestsBase.cs b/tests/ArmTemplates.Tests/Extractor/Abstractions/ExtractorMockerWithOutputTestsBase.cs
index 496767e2..037e778e 100644
--- a/tests/ArmTemplates.Tests/Extractor/Abstractions/ExtractorMockerWithOutputTestsBase.cs
+++ b/tests/ArmTemplates.Tests/Extractor/Abstractions/ExtractorMockerWithOutputTestsBase.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Tests.Extractor.
 {
     public class ExtractorMockerWithOutputTestsBase : ExtractorMockerTestsBase
     {
-        protected const string TESTS_OUTPUT_DIRECTORY = "tests-output";
+        protected const string TESTS_OUTPUT_DIRECTORY = "tests-output\\extractor";
         protected string OutputDirectory;
 
         protected ExtractorMockerWithOutputTestsBase(string outputDirectoryName)