diff --git a/Geo/GeoPointFromName/README.md b/Geo/GeoPointFromName/README.md
index 3b48bada..6da769c2 100644
--- a/Geo/GeoPointFromName/README.md
+++ b/Geo/GeoPointFromName/README.md
@@ -4,7 +4,8 @@ languages:
 - csharp
 products:
 - azure
-- azure-cognitive-services
+- azure-search
+- azure-maps
 name: Get geo-point from name sample skill for cognitive search
 description: "This custom skill takes a string input that represents a location (city, country, address or point of interest) and returns a geo-point."
 azureDeploy: https://raw.githubusercontent.com/Azure-Samples/azure-search-power-skills/master/Geo/GeoPointFromName/azuredeploy.json
diff --git a/Template/HelloWorld/README.md b/Template/HelloWorld/README.md
index ecc9899f..bf9ccd96 100644
--- a/Template/HelloWorld/README.md
+++ b/Template/HelloWorld/README.md
@@ -4,7 +4,7 @@ languages:
 - csharp
 products:
 - azure
-- azure-cognitive-services
+- azure-search
 azureDeploy: https://raw.githubusercontent.com/Azure-Samples/azure-search-power-skills/master/Template/HelloWorld/azuredeploy.json
 name: "Hello World sample skill for cognitive search"
 description: "This Hello World custom skills can be used as a template to create your own skills."
diff --git a/Text/AcronymLinker/README.md b/Text/AcronymLinker/README.md
index 30490d48..b78c0d4d 100644
--- a/Text/AcronymLinker/README.md
+++ b/Text/AcronymLinker/README.md
@@ -4,7 +4,7 @@ languages:
 - csharp
 products:
 - azure
-- azure-cognitive-services
+- azure-search
 name: Acronym Linker sample skills for cognitive search
 description: These two custom skills (link-acronyms and link-acronyms-list) give definitions for known acronyms.
 azureDeploy: https://raw.githubusercontent.com/Azure-Samples/azure-search-power-skills/master/Text/AcronymLinker/azuredeploy.json
diff --git a/Text/BingEntitySearch/README.md b/Text/BingEntitySearch/README.md
index fab15507..ecd69d28 100644
--- a/Text/BingEntitySearch/README.md
+++ b/Text/BingEntitySearch/README.md
@@ -4,6 +4,7 @@ languages:
 - csharp
 products:
 - azure
+- azure-search
 - azure-cognitive-services
 name: Bing Entity Search sample skill for cognitive search
 description: This custom skill finds rich and structured information about public figures, locations, or organizations.
diff --git a/Text/CustomEntitySearch/README.md b/Text/CustomEntitySearch/README.md
index 9e4ba69b..1af47e6f 100644
--- a/Text/CustomEntitySearch/README.md
+++ b/Text/CustomEntitySearch/README.md
@@ -3,7 +3,8 @@ topic: sample
 languages:
 - csharp
 products:
-- azure-cognitive-services
+- azure
+- azure-search
 name: Custom Entity Search sample skill for cognitive search
 description: This custom skill finds user defined entities in given texts.
 azureDeploy: https://raw.githubusercontent.com/Azure-Samples/azure-search-power-skills/master/Text/CustomEntitySearch/azuredeploy.json
diff --git a/Text/Tokenizer/README.md b/Text/Tokenizer/README.md
index 10658530..53f6f340 100644
--- a/Text/Tokenizer/README.md
+++ b/Text/Tokenizer/README.md
@@ -4,7 +4,7 @@ languages:
 - csharp
 products:
 - azure
-- azure-cognitive-services
+- azure-search
 name: Tokenizer sample skill for cognitive search
 description: This custom skill extracts normalized non-stop words from a text using the ML.NET library.
 azureDeploy: https://raw.githubusercontent.com/Azure-Samples/azure-search-power-skills/master/Text/Tokenizer/azuredeploy.json
diff --git a/Vision/AnalyzeForm/README.md b/Vision/AnalyzeForm/README.md
index d057ca6a..0e292879 100644
--- a/Vision/AnalyzeForm/README.md
+++ b/Vision/AnalyzeForm/README.md
@@ -4,6 +4,7 @@ languages:
 - csharp
 products:
 - azure
+- azure-search
 - azure-cognitive-services
 name: Analyze form sample skill for cognitive search
 urlFragment: azure-analyzeform-sample
diff --git a/Vision/HocrGenerator/README.md b/Vision/HocrGenerator/README.md
index c3d84a9b..99ede1a0 100644
--- a/Vision/HocrGenerator/README.md
+++ b/Vision/HocrGenerator/README.md
@@ -3,9 +3,8 @@ page_type: sample
 languages:
 - csharp
 products:
-- dotnet
 - azure
-- azure-cognitive-services
+- azure-search
 urlFragment: azure-hocr-generator-sample
 name: hOCR generator sample skill for cognitive search
 description: This custom skill generates an hOCR document from the output of the OCR skill.
diff --git a/Vision/ImageStore/README.md b/Vision/ImageStore/README.md
index 2d918f2a..caebf22b 100644
--- a/Vision/ImageStore/README.md
+++ b/Vision/ImageStore/README.md
@@ -4,7 +4,7 @@ languages:
 - csharp
 products:
 - azure
-- azure-cognitive-services
+- azure-search
 name: Image store sample skills for cognitive search
 urlFragment: azure-imagestore-sample
 description: These custom skills store or retrieve a base64-encoded image to or from blob storage.