Merge branch 'comvis-updates' of https://github.com/PatrickFarley/azure-docs-pr into comvis-updates

Author: PatrickFarley

articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-csharp.md

@@ -24,7 +24,7 @@ To authenticate against the Image Analysis service, you need a Computer Vision k
 
 Start by creating a **ImageAnalysisClient** object. For example:
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_client)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_client)]
 
 
 ## Select the image to analyze
@@ -35,14 +35,14 @@ You can select an image by providing a publicly accessible image URL, or by pass
 
 Create a **Uri** object for the image you want to analyze.
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_url)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_url)]
 
 
 ### Image buffer
 
 Alternatively, you can pass the image data to the SDK through a **BinaryData** object. For example, read from a local image file you want to analyze.
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_file)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_file)]
 
 
 
@@ -56,7 +56,7 @@ The Analysis 4.0 API gives you access to all of the service's image analysis fea
 
 
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_features)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_features)]
 
 <!--
 ### Set model name when using a custom model
@@ -79,24 +79,24 @@ Use an **ImageAnalysisOptions** object to specify various options for the Analyz
 - **Crop aspect ratio**: An aspect ratio is calculated by dividing the target crop width by the height. Supported values are from 0.75 to 1.8 (inclusive). Setting this property is only relevant when **VisualFeatures.SmartCrops** was selected as part the visual feature list. If you select **VisualFeatures.SmartCrops** but don't specify aspect ratios, the service returns one crop suggestion with an aspect ratio it sees fit. In this case, the aspect ratio is between 0.5 and 2.0 (inclusive).
 
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_options)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_options)]
 
 ## Call the Analyze API
 
 This section shows you how to make an analysis call to the service. 
 
 Call the **Analyze** method on the **ImageAnalysisClient** object, as shown here. The call is synchronous, and will block until the service returns the results or an error occurred. Alternatively, you can call the non-blocking **AnalyzeAsync** method.
 
-Use the input objects created in the above sections. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with the `imageStream` variable.
+Use the input objects created in the above sections. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with the `imageData` variable.
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_call)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_call)]
 
 
 ## Get results from the service
 
 The following code shows you how to parse the results of the various Analyze operations.
 
-[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-quickstart/HowTo.cs?name=snippet_results)]
+[!code-csharp[](~/cognitive-services-quickstart-code/dotnet/ComputerVision/4-0/image-analysis-how-to/Program.cs?name=snippet_results)]
 
 <!--
 ### Get results using custom model

articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-java.md

@@ -87,7 +87,7 @@ This section shows you how to make an analysis call to the service.
 
 Call the **analyze** method on the **ImageAnalysisClient** object, as shown here. The call is synchronous, and will block until the service returns the results or an error occurred. Alternatively, you can use a **ImageAnalysisAsyncClient** object instead, and call its **analyze** method which is non-blocking. 
 
-Use the input objects created in the above sections. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with `imageBuffer`.
+Use the input objects created in the above sections. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with `imageData`.
 
 [!code-java[](~/cognitive-services-quickstart-code/java/ComputerVision/4-0/ImageAnalysisHowTo.java?name=snippet_call)]
 

articles/ai-services/computer-vision/includes/how-to-guides/analyze-image-40-js.md

@@ -51,7 +51,7 @@ The Analysis 4.0 API gives you access to all of the service's image analysis fea
 
 ## Call the Analyze API with options
 
-The following code calls the Analyze API with the features you selected above and additional options, defined below. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with `imageBuffer`.
+The following code calls the Analyze API with the features you selected above and additional options, defined below. To analyze from an image buffer instead of URL, replace `imageURL` in the method call with `imageData`.
 
 [!code-javascript[](~/cognitive-services-quickstart-code/javascript/ComputerVision/4-0/how-to.js?name=snippet_call)]
 

articles/ai-services/computer-vision/includes/quickstarts-sdk/image-analysis-java-sdk-40.md

@@ -74,7 +74,7 @@ Open a console window and create a new folder for your quickstart application.
 
 Open a text editor and copy the following content to a new file. Save the file as `ImageAnalysis.java`
 
-[!code-java[](~/cognitive-services-quickstart-code/java/ComputerVision/4-0/ImageAnalysis.java?name=snippet_single)]
+[!code-java[](~/cognitive-services-quickstart-code/java/ComputerVision/4-0/ImageAnalysisQuickStart.java?name=snippet_single)]
 
 > [!TIP]
 > The code analyzes an image from a URL. You can also analyze an image from the program memory buffer. For more information, see the [Analyze Image how-to guide](../../how-to/call-analyze-image-40.md).