diff --git a/samples/PABot/Bots/SsoBot.cs b/samples/PABot/Bots/SsoBot.cs
index b53a85755..8bdc82daa 100644
--- a/samples/PABot/Bots/SsoBot.cs
+++ b/samples/PABot/Bots/SsoBot.cs
@@ -362,7 +362,7 @@ private async Task TestOAuthCardSendScenario(ITurnContext<IMessageActivity> turn
                 logger.LogInformation($"ConversationId: {activity.Conversation.Id}");
                 logger.LogInformation($"Recipient: {activity.Recipient.Id}");
 
-                // This is the call that causes NullReferenceException when APX returns 202 with empty body
+                // This is the call that causes NullReferenceException when the Teams service returns 202 with empty body
                 ResourceResponse response = await connectorClient.Conversations.SendToConversationAsync(
                     (Microsoft.Bot.Schema.Activity)activity,
                     cancellationToken
diff --git a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs
index 2d095ce94..98182af3c 100644
--- a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs
+++ b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs
@@ -20,7 +20,7 @@ public static string ThreadId(this Conversation conversation)
 
     /// <summary>
     /// Construct a threaded conversation ID by appending <c>;messageid={messageId}</c>
-    /// to the conversation ID. This is the format APX uses to route messages
+    /// to the conversation ID. This is the format the Teams service uses to route messages
     /// to a specific thread in a channel.
     /// </summary>
     /// <param name="conversationId">the conversation to thread into (e.g. <c>19:abc@thread.skype</c>)</param>
diff --git a/test/IntegrationTests/README.md b/test/IntegrationTests/README.md
index 9ecdff31c..965938ae8 100644
--- a/test/IntegrationTests/README.md
+++ b/test/IntegrationTests/README.md
@@ -1,6 +1,6 @@
 # Teams SDK Integration Tests
 
-This project runs integration tests against Teams Server (SMBA/APX) using bot and agentic identities.
+This project runs integration tests against Teams Server using bot and agentic identities.
 
 ## Prerequisites
 
diff --git a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs
index d769e43ea..30112377a 100644
--- a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs
+++ b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs
@@ -400,7 +400,7 @@ public async Task ReplyToActivityWithHttpMessagesAsync_SetsReplyToIdProperty()
         public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId()
         {
             // This test verifies the fix for the OAuth card null reference bug
-            // When APX returns 202 Accepted with no body, SendActivityAsync returns null
+            // When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null
             // We should return string.Empty for Id instead of null to maintain API contract
 
             // Arrange
@@ -433,7 +433,7 @@ public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturn
         public async Task ReplyToActivityWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId()
         {
             // This test verifies the fix for the OAuth card null reference bug in ReplyToActivity
-            // When APX returns 202 Accepted with no body, SendActivityAsync returns null
+            // When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null
             // We should return string.Empty for Id instead of null to maintain API contract
 
             // Arrange
diff --git a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs
index 9252256bd..f09f605e3 100644
--- a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs
+++ b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs
@@ -176,7 +176,7 @@ public void FromInboundActivity_IgnoresAgenticFieldsOnSender()
     [Fact]
     public void FromInboundActivity_FallsBackToRecipientId_WhenBotIdAbsent()
     {
-        // Standard (non-agentic) inbound activity: SMBA does not populate BotId, but Recipient.Id
+        // Standard (non-agentic) inbound activity: the Teams service does not populate BotId, but Recipient.Id
         // carries the Teams-style "28:<appId>" value.
         CoreActivity activity = new()
         {
diff --git a/test/TeamsApisDemo/Program.cs b/test/TeamsApisDemo/Program.cs
index c727dcbb8..4774fdb77 100644
--- a/test/TeamsApisDemo/Program.cs
+++ b/test/TeamsApisDemo/Program.cs
@@ -26,8 +26,8 @@
 Console.WriteLine($"Running Teams Bot Application for appId '{teamsBotApplication.AppId}' with version '{TeamsBotApplication.Version}'.");
 
 
-var smba = new Uri("https://smba.trafficmanager.net/amer");
-var conversations = teamsBotApplication.Api.ForServiceUrl(smba).Conversations;
+var serviceUrl = new Uri("https://smba.trafficmanager.net/amer");
+var conversations = teamsBotApplication.Api.ForServiceUrl(serviceUrl).Conversations;
 
 int pages = 1;
 string cid = "19%3ALydFnezGKSkhYoiLNP6kZ8AuXQr36EDAkvG9CNJSPKc1%40thread.tacv2";