diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
index b4ff23c5722b..a00a8c8137a9 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputAsyncTest.java
@@ -195,7 +195,7 @@ public void recognizeEntitiesNullInput() {
      * {@link TextAnalyticsAsyncClient#recognizeEntities(String, String)}
      */
     @Test
-    public void recognizeEntitiesNullInputWithCountryHint() {
+    public void recognizeEntitiesNullInputWithLanguageHint() {
         StepVerifier.create(client.recognizeEntities(null, "en"))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -234,7 +234,7 @@ public void recognizeEntitiesBatchEmptyInputList() {
      * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHint() {
+    public void recognizeEntitiesBatchNullInputWithLanguageHint() {
         StepVerifier.create(client.recognizeEntitiesBatch(null, "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -247,7 +247,7 @@ public void recognizeEntitiesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
+    public void recognizeEntitiesBatchEmptyInputListWithLanguageHint() {
         StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList(), "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(IllegalArgumentException.class, exception.getClass());
@@ -260,7 +260,7 @@ public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeEntitiesBatchNullInputWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.recognizeEntitiesBatch(null, "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -274,7 +274,7 @@ public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsAsyncClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void recognizeEntitiesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.recognizeEntitiesBatch(Collections.emptyList(), "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -331,7 +331,7 @@ public void recognizeLinkedEntitiesNullInput() {
      * {@link TextAnalyticsAsyncClient#recognizeLinkedEntities(String, String)}
      */
     @Test
-    public void recognizeLinkedEntitiesNullInputWithCountryHint() {
+    public void recognizeLinkedEntitiesNullInputWithLanguageHint() {
         StepVerifier.create(client.recognizeLinkedEntities(null, "en"))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -370,7 +370,7 @@ public void recognizeLinkedEntitiesBatchEmptyInputList() {
      * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
+    public void recognizeLinkedEntitiesBatchNullInputWithLanguageHint() {
         StepVerifier.create(client.recognizeLinkedEntitiesBatch(null, "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -383,7 +383,7 @@ public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithLanguageHint() {
         StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(IllegalArgumentException.class, exception.getClass());
@@ -396,7 +396,7 @@ public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeLinkedEntitiesBatchNullInputWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.recognizeLinkedEntitiesBatch(null, "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -410,7 +410,7 @@ public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOption
      * {@link TextAnalyticsAsyncClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -467,7 +467,7 @@ public void extractKeyPhrasesNullInput() {
      * {@link TextAnalyticsAsyncClient#extractKeyPhrases(String, String)}
      */
     @Test
-    public void extractKeyPhrasesNullInputWithCountryHint() {
+    public void extractKeyPhrasesNullInputWithLanguageHint() {
         StepVerifier.create(client.extractKeyPhrases(null, "en"))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -506,7 +506,7 @@ public void extractKeyPhrasesBatchEmptyInputList() {
      * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithCountryHint() {
+    public void extractKeyPhrasesBatchNullInputWithLanguageHint() {
         StepVerifier.create(client.extractKeyPhrasesBatch(null, "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -519,7 +519,7 @@ public void extractKeyPhrasesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
+    public void extractKeyPhrasesBatchEmptyInputListWithLanguageHint() {
         StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList(), "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(IllegalArgumentException.class, exception.getClass());
@@ -532,7 +532,7 @@ public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void extractKeyPhrasesBatchNullInputWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.extractKeyPhrasesBatch(null, "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -546,7 +546,7 @@ public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsAsyncClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void extractKeyPhrasesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.extractKeyPhrasesBatch(Collections.emptyList(), "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -590,7 +590,7 @@ public void extractKeyPhrasesBatchEmptyInputListWithMaxOverload() {
      * {@link TextAnalyticsAsyncClient#analyzeSentiment(String)}
      */
     @Test
-    public void analyseSentimentNullInput() {
+    public void analyzeSentimentNullInput() {
         StepVerifier.create(client.analyzeSentiment(null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -603,7 +603,7 @@ public void analyseSentimentNullInput() {
      * {@link TextAnalyticsAsyncClient#analyzeSentiment(String, String)}
      */
     @Test
-    public void analyseSentimentNullInputWithCountryHint() {
+    public void analyzeSentimentNullInputWithLanguageHint() {
         StepVerifier.create(client.analyzeSentiment(null, "en"))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -616,7 +616,7 @@ public void analyseSentimentNullInputWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInput() {
+    public void analyzeSentimentBatchNullInput() {
         StepVerifier.create(client.analyzeSentimentBatch(null, null, null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -629,7 +629,7 @@ public void analyseSentimentBatchNullInput() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputList() {
+    public void analyzeSentimentBatchEmptyInputList() {
         StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(), null, null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(IllegalArgumentException.class, exception.getClass());
@@ -642,7 +642,7 @@ public void analyseSentimentBatchEmptyInputList() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHint() {
+    public void analyzeSentimentBatchNullInputWithLanguageHint() {
         StepVerifier.create(client.analyzeSentimentBatch(null, "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(NullPointerException.class, exception.getClass());
@@ -655,7 +655,7 @@ public void analyseSentimentBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputListWithCountryHint() {
+    public void analyzeSentimentBatchEmptyInputListWithLanguageHint() {
         StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(), "en", null))
             .verifyErrorSatisfies(exception -> {
                 assertEquals(IllegalArgumentException.class, exception.getClass());
@@ -668,7 +668,7 @@ public void analyseSentimentBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
+    public void analyzeSentimentBatchNullInputWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.analyzeSentimentBatch(null, "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -682,7 +682,7 @@ public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void analyzeSentimentBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         StepVerifier.create(client.analyzeSentimentBatch(Collections.emptyList(), "en",
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -696,7 +696,7 @@ public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions(
      * {@link TextAnalyticsAsyncClient#analyzeSentimentBatchWithResponse(Iterable, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithMaxOverload() {
+    public void analyzeSentimentBatchNullInputWithMaxOverload() {
         StepVerifier.create(client.analyzeSentimentBatchWithResponse(null,
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
@@ -710,7 +710,7 @@ public void analyseSentimentBatchNullInputWithMaxOverload() {
      * given for {@link TextAnalyticsAsyncClient#analyzeSentimentBatchWithResponse(Iterable, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentEmptyInputListWithMaxOverload() {
+    public void analyzeSentimentEmptyInputListWithMaxOverload() {
         StepVerifier.create(client.analyzeSentimentBatchWithResponse(Collections.emptyList(),
             new TextAnalyticsRequestOptions().setIncludeStatistics(true)))
             .verifyErrorSatisfies(exception -> {
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
index 8016a1c03ce0..e8e74f2e7167 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/DocumentInputTest.java
@@ -173,7 +173,7 @@ public void recognizeEntitiesNullInput() {
      * {@link TextAnalyticsClient#recognizeEntities(String, String)}
      */
     @Test
-    public void recognizeEntitiesNullInputWithCountryHint() {
+    public void recognizeEntitiesNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeEntities(null, "en"));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
@@ -206,7 +206,7 @@ public void recognizeEntitiesBatchEmptyInputList() {
      * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHint() {
+    public void recognizeEntitiesBatchNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeEntitiesBatch(null, "en", null));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -217,7 +217,7 @@ public void recognizeEntitiesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
+    public void recognizeEntitiesBatchEmptyInputListWithLanguageHint() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeEntitiesBatch(Collections.emptyList(), "en", null));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
@@ -228,7 +228,7 @@ public void recognizeEntitiesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeEntitiesBatchNullInputWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeEntitiesBatch(null, "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -240,7 +240,7 @@ public void recognizeEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsClient#recognizeEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void recognizeEntitiesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeEntitiesBatch(Collections.emptyList(), "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -289,7 +289,7 @@ public void recognizeLinkedEntitiesNullInput() {
      * {@link TextAnalyticsClient#recognizeLinkedEntities(String, String)}
      */
     @Test
-    public void recognizeLinkedEntitiesNullInputWithCountryHint() {
+    public void recognizeLinkedEntitiesNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeLinkedEntities(null, "en"));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
@@ -322,7 +322,7 @@ public void recognizeLinkedEntitiesBatchEmptyInputList() {
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
+    public void recognizeLinkedEntitiesBatchNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeLinkedEntitiesBatch(null, "en", null));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -333,7 +333,7 @@ public void recognizeLinkedEntitiesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithLanguageHint() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en", null));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
@@ -344,7 +344,7 @@ public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void recognizeLinkedEntitiesBatchNullInputWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.recognizeLinkedEntitiesBatch(null, "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -356,7 +356,7 @@ public void recognizeLinkedEntitiesBatchNullInputWithCountryHintAndRequestOption
      * {@link TextAnalyticsClient#recognizeLinkedEntitiesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void recognizeLinkedEntitiesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void recognizeLinkedEntitiesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.recognizeLinkedEntitiesBatch(Collections.emptyList(), "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -406,7 +406,7 @@ public void extractKeyPhrasesNullInput() {
      * {@link TextAnalyticsClient#extractKeyPhrases(String, String)}
      */
     @Test
-    public void extractKeyPhrasesNullInputWithCountryHint() {
+    public void extractKeyPhrasesNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.extractKeyPhrases(null, "en"));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
@@ -439,7 +439,7 @@ public void extractKeyPhrasesBatchEmptyInputList() {
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithCountryHint() {
+    public void extractKeyPhrasesBatchNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.extractKeyPhrasesBatch(null, "en", null));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -450,7 +450,7 @@ public void extractKeyPhrasesBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
+    public void extractKeyPhrasesBatchEmptyInputListWithLanguageHint() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.extractKeyPhrasesBatch(Collections.emptyList(), "en", null));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
@@ -461,7 +461,7 @@ public void extractKeyPhrasesBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
+    public void extractKeyPhrasesBatchNullInputWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.extractKeyPhrasesBatch(null, "en", new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -472,7 +472,7 @@ public void extractKeyPhrasesBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsClient#extractKeyPhrasesBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void extractKeyPhrasesBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void extractKeyPhrasesBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.extractKeyPhrasesBatch(Collections.emptyList(), "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -511,7 +511,7 @@ public void extractKeyPhrasesBatchEmptyInputListWithMaxOverload() {
      * {@link TextAnalyticsClient#analyzeSentiment(String)}
      */
     @Test
-    public void analyseSentimentNullInput() {
+    public void analyzeSentimentNullInput() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentiment(null));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
@@ -522,7 +522,7 @@ public void analyseSentimentNullInput() {
      * {@link TextAnalyticsClient#analyzeSentiment(String, String)}
      */
     @Test
-    public void analyseSentimentNullInputWithCountryHint() {
+    public void analyzeSentimentNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentiment(null, "en"));
         assertTrue(INVALID_DOCUMENT_NPE_MESSAGE.equals(exception.getMessage()));
@@ -533,7 +533,7 @@ public void analyseSentimentNullInputWithCountryHint() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInput() {
+    public void analyzeSentimentBatchNullInput() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentimentBatch(null, null, null));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -544,7 +544,7 @@ public void analyseSentimentBatchNullInput() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputList() {
+    public void analyzeSentimentBatchEmptyInputList() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.analyzeSentimentBatch(Collections.emptyList(), null, null));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
@@ -555,7 +555,7 @@ public void analyseSentimentBatchEmptyInputList() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHint() {
+    public void analyzeSentimentBatchNullInputWithLanguageHint() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentimentBatch(null, "en", null));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -566,7 +566,7 @@ public void analyseSentimentBatchNullInputWithCountryHint() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputListWithCountryHint() {
+    public void analyzeSentimentBatchEmptyInputListWithLanguageHint() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.analyzeSentimentBatch(Collections.emptyList(), "en", null));
         assertTrue(INVALID_DOCUMENT_EMPTY_LIST_EXCEPTION_MESSAGE.equals(exception.getMessage()));
@@ -577,7 +577,7 @@ public void analyseSentimentBatchEmptyInputListWithCountryHint() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
+    public void analyzeSentimentBatchNullInputWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentimentBatch(null, "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -589,7 +589,7 @@ public void analyseSentimentBatchNullInputWithCountryHintAndRequestOptions() {
      * {@link TextAnalyticsClient#analyzeSentimentBatch(Iterable, String, TextAnalyticsRequestOptions)}
      */
     @Test
-    public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions() {
+    public void analyzeSentimentBatchEmptyInputListWithLanguageHintAndRequestOptions() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.analyzeSentimentBatch(Collections.emptyList(), "en",
                 new TextAnalyticsRequestOptions().setIncludeStatistics(true)));
@@ -601,7 +601,7 @@ public void analyseSentimentBatchEmptyInputListWithCountryHintAndRequestOptions(
      * {@link TextAnalyticsClient#analyzeSentimentBatchWithResponse(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void analyseSentimentBatchNullInputWithMaxOverload() {
+    public void analyzeSentimentBatchNullInputWithMaxOverload() {
         Exception exception = assertThrows(NullPointerException.class, () ->
             client.analyzeSentimentBatchWithResponse(null, new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
         assertTrue(INVALID_DOCUMENT_BATCH_NPE_MESSAGE.equals(exception.getMessage()));
@@ -612,7 +612,7 @@ public void analyseSentimentBatchNullInputWithMaxOverload() {
      * given for {@link TextAnalyticsClient#analyzeSentimentBatchWithResponse(Iterable, TextAnalyticsRequestOptions, Context)}
      */
     @Test
-    public void analyseSentimentEmptyInputListWithMaxOverload() {
+    public void analyzeSentimentEmptyInputListWithMaxOverload() {
         Exception exception = assertThrows(IllegalArgumentException.class, () ->
             client.analyzeSentimentBatchWithResponse(
                 Collections.emptyList(), new TextAnalyticsRequestOptions().setIncludeStatistics(true), Context.NONE));
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
index abd22649c4b2..83de30a3024c 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
@@ -561,7 +561,7 @@ public void extractKeyPhrasesBatchWarning(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(TextSentiment.MIXED,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
@@ -580,7 +580,7 @@ public void analyseSentimentForTextInput(HttpClient httpClient, TextAnalyticsSer
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
         StepVerifier.create(client.analyzeSentiment(""))
             .expectErrorMatches(throwable -> throwable instanceof TextAnalyticsException
@@ -592,7 +592,7 @@ public void analyseSentimentForEmptyText(HttpClient httpClient, TextAnalyticsSer
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(
             TextSentiment.NEUTRAL,
@@ -611,9 +611,9 @@ public void analyseSentimentForFaultyText(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentDuplicateIdInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentDuplicateIdInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseBatchSentimentDuplicateIdRunner(inputs ->
+        analyzeBatchSentimentDuplicateIdRunner(inputs ->
             StepVerifier.create(client.analyzeSentimentBatchWithResponse(inputs, null))
                 .verifyErrorSatisfies(ex -> assertEquals(HttpResponseException.class, ex.getClass())));
     }
@@ -623,9 +623,9 @@ public void analyseSentimentDuplicateIdInput(HttpClient httpClient, TextAnalytic
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseSentimentStringInputRunner(inputs ->
+        analyzeSentimentStringInputRunner(inputs ->
             StepVerifier.create(client.analyzeSentimentBatch(inputs, null, null))
                 .assertNext(response -> validateSentimentResultCollection(false, getExpectedBatchTextSentiment(), response))
                 .verifyComplete());
@@ -636,9 +636,9 @@ public void analyseSentimentForBatchStringInput(HttpClient httpClient, TextAnaly
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseSentimentLanguageHintRunner((inputs, language) ->
+        analyzeSentimentLanguageHintRunner((inputs, language) ->
             StepVerifier.create(client.analyzeSentimentBatch(inputs, language, null))
                 .assertNext(response -> validateSentimentResultCollection(false, getExpectedBatchTextSentiment(), response))
                 .verifyComplete());
@@ -649,9 +649,9 @@ public void analyseSentimentForListLanguageHint(HttpClient httpClient, TextAnaly
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForListStringWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForListStringWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseBatchStringSentimentShowStatsRunner((inputs, options) ->
+        analyzeBatchStringSentimentShowStatsRunner((inputs, options) ->
             StepVerifier.create(client.analyzeSentimentBatch(inputs, null, options))
                 .assertNext(response -> validateSentimentResultCollection(true, getExpectedBatchTextSentiment(), response))
                 .verifyComplete());
@@ -662,9 +662,9 @@ public void analyseSentimentForListStringWithOptions(HttpClient httpClient, Text
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseBatchSentimentRunner(inputs ->
+        analyzeBatchSentimentRunner(inputs ->
             StepVerifier.create(client.analyzeSentimentBatchWithResponse(inputs, null))
                 .assertNext(response -> validateSentimentResultCollectionWithResponse(false, getExpectedBatchTextSentiment(), 200, response))
                 .verifyComplete());
@@ -675,9 +675,9 @@ public void analyseSentimentForBatchInput(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
-        analyseBatchSentimentShowStatsRunner((inputs, options) ->
+        analyzeBatchSentimentShowStatsRunner((inputs, options) ->
             StepVerifier.create(client.analyzeSentimentBatchWithResponse(inputs, options))
                 .assertNext(response -> validateSentimentResultCollectionWithResponse(true, getExpectedBatchTextSentiment(), 200, response))
                 .verifyComplete());
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
index 5b0822ab572b..c73ebf0755aa 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
@@ -501,7 +501,7 @@ public void extractKeyPhrasesBatchWarning(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(
             TextSentiment.MIXED,
@@ -521,7 +521,7 @@ public void analyseSentimentForTextInput(HttpClient httpClient, TextAnalyticsSer
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
         Exception exception = assertThrows(TextAnalyticsException.class, () -> client.analyzeSentiment(""));
         assertTrue(exception.getMessage().equals(INVALID_DOCUMENT_EXPECTED_EXCEPTION_MESSAGE));
@@ -532,7 +532,7 @@ public void analyseSentimentForEmptyText(HttpClient httpClient, TextAnalyticsSer
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
         final DocumentSentiment expectedDocumentSentiment = new DocumentSentiment(TextSentiment.NEUTRAL,
             new SentimentConfidenceScores(0.0, 0.0, 0.0),
@@ -551,9 +551,9 @@ public void analyseSentimentForFaultyText(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentDuplicateIdInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentDuplicateIdInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseBatchSentimentDuplicateIdRunner(inputs -> {
+        analyzeBatchSentimentDuplicateIdRunner(inputs -> {
             HttpResponseException response = assertThrows(HttpResponseException.class,
                 () -> client.analyzeSentimentBatchWithResponse(inputs, null, Context.NONE));
             assertEquals(HttpURLConnection.HTTP_BAD_REQUEST, response.getResponse().getStatusCode());
@@ -565,9 +565,9 @@ public void analyseSentimentDuplicateIdInput(HttpClient httpClient, TextAnalytic
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseSentimentStringInputRunner(inputs ->
+        analyzeSentimentStringInputRunner(inputs ->
             validateSentimentResultCollection(false, getExpectedBatchTextSentiment(),
                 client.analyzeSentimentBatch(inputs, null, null)));
     }
@@ -577,9 +577,9 @@ public void analyseSentimentForBatchStringInput(HttpClient httpClient, TextAnaly
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseSentimentLanguageHintRunner((inputs, language) ->
+        analyzeSentimentLanguageHintRunner((inputs, language) ->
             validateSentimentResultCollection(false, getExpectedBatchTextSentiment(),
                 client.analyzeSentimentBatch(inputs, language, null)));
     }
@@ -589,9 +589,9 @@ public void analyseSentimentForListLanguageHint(HttpClient httpClient, TextAnaly
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForListStringWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForListStringWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseBatchStringSentimentShowStatsRunner((inputs, options) ->
+        analyzeBatchStringSentimentShowStatsRunner((inputs, options) ->
             validateSentimentResultCollection(true, getExpectedBatchTextSentiment(),
                 client.analyzeSentimentBatch(inputs, null, options)));
     }
@@ -601,9 +601,9 @@ public void analyseSentimentForListStringWithOptions(HttpClient httpClient, Text
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseBatchSentimentRunner(inputs ->
+        analyzeBatchSentimentRunner(inputs ->
             validateSentimentResultCollectionWithResponse(false, getExpectedBatchTextSentiment(), 200,
                 client.analyzeSentimentBatchWithResponse(inputs, null, Context.NONE)));
     }
@@ -613,9 +613,9 @@ public void analyseSentimentForBatchInput(HttpClient httpClient, TextAnalyticsSe
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
-    public void analyseSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
+    public void analyzeSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
         client = getTextAnalyticsClient(httpClient, serviceVersion);
-        analyseBatchSentimentShowStatsRunner((inputs, options) ->
+        analyzeBatchSentimentShowStatsRunner((inputs, options) ->
             validateSentimentResultCollectionWithResponse(true, getExpectedBatchTextSentiment(), 200,
                 client.analyzeSentimentBatchWithResponse(inputs, options, Context.NONE)));
     }
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
index 4d0f7e444648..f4fcfcd46bd3 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
+++ b/sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTestBase.java
@@ -159,25 +159,25 @@ public abstract class TextAnalyticsClientTestBase extends TestBase {
 
     // Sentiment
     @Test
-    abstract void analyseSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForEmptyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForFaultyText(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForBatchInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForBatchInputShowStatistics(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForBatchStringInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     @Test
-    abstract void analyseSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
+    abstract void analyzeSentimentForListLanguageHint(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion);
 
     // Detect Language runner
     void detectLanguageShowStatisticsRunner(BiConsumer<List<DetectLanguageInput>,
@@ -328,27 +328,27 @@ void extractKeyPhrasesBatchWarningRunner(Consumer<List<TextDocumentInput>> testR
     }
 
     // Sentiment Runner
-    void analyseSentimentLanguageHintRunner(BiConsumer<List<String>, String> testRunner) {
+    void analyzeSentimentLanguageHintRunner(BiConsumer<List<String>, String> testRunner) {
         testRunner.accept(SENTIMENT_INPUTS, "en");
     }
 
-    void analyseSentimentStringInputRunner(Consumer<List<String>> testRunner) {
+    void analyzeSentimentStringInputRunner(Consumer<List<String>> testRunner) {
         testRunner.accept(SENTIMENT_INPUTS);
     }
 
-    void analyseBatchSentimentRunner(Consumer<List<TextDocumentInput>> testRunner) {
+    void analyzeBatchSentimentRunner(Consumer<List<TextDocumentInput>> testRunner) {
         testRunner.accept(TestUtils.getTextDocumentInputs(SENTIMENT_INPUTS));
     }
 
-    void analyseBatchSentimentDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
+    void analyzeBatchSentimentDuplicateIdRunner(Consumer<List<TextDocumentInput>> testRunner) {
         testRunner.accept(getDuplicateTextDocumentInputs());
     }
 
-    void analyseBatchStringSentimentShowStatsRunner(BiConsumer<List<String>, TextAnalyticsRequestOptions> testRunner) {
+    void analyzeBatchStringSentimentShowStatsRunner(BiConsumer<List<String>, TextAnalyticsRequestOptions> testRunner) {
         testRunner.accept(SENTIMENT_INPUTS, new TextAnalyticsRequestOptions().setIncludeStatistics(true));
     }
 
-    void analyseBatchSentimentShowStatsRunner(
+    void analyzeBatchSentimentShowStatsRunner(
         BiConsumer<List<TextDocumentInput>, TextAnalyticsRequestOptions> testRunner) {
         final List<TextDocumentInput> textDocumentInputs = TestUtils.getTextDocumentInputs(SENTIMENT_INPUTS);
 
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentDuplicateIdInput.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentDuplicateIdInput.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentDuplicateIdInput.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchInput.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInput.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchInput.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchInputShowStatistics.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchInputShowStatistics.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchInputShowStatistics.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchStringInput.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForBatchStringInput.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForBatchStringInput.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForEmptyText.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForEmptyText.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForEmptyText.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForFaultyText.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForFaultyText.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForFaultyText.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForListLanguageHint.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListLanguageHint.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForListLanguageHint.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForListStringWithOptions.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForListStringWithOptions.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForListStringWithOptions.json
diff --git a/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json b/sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForTextInput.json
similarity index 100%
rename from sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyseSentimentForTextInput.json
rename to sdk/textanalytics/azure-ai-textanalytics/src/test/resources/session-records/analyzeSentimentForTextInput.json