diff --git a/libraries/botbuilder-core/botbuilder/core/activity_handler.py b/libraries/botbuilder-core/botbuilder/core/activity_handler.py
index fed53bb45..40c06d91e 100644
--- a/libraries/botbuilder-core/botbuilder/core/activity_handler.py
+++ b/libraries/botbuilder-core/botbuilder/core/activity_handler.py
@@ -33,7 +33,7 @@ async def on_turn(self, turn_context: TurnContext):
         elif turn_context.activity.type == ActivityTypes.event:
             await self.on_event_activity(turn_context)
         elif turn_context.activity.type == ActivityTypes.end_of_conversation:
-            await self.on_end_of_conversation(turn_context)
+            await self.on_end_of_conversation_activity(turn_context)
         else:
             await self.on_unrecognized_activity_type(turn_context)
 
@@ -106,7 +106,7 @@ async def on_event(  # pylint: disable=unused-argument
     ):
         return
 
-    async def on_end_of_conversation(  # pylint: disable=unused-argument
+    async def on_end_of_conversation_activity(  # pylint: disable=unused-argument
         self, turn_context: TurnContext
     ):
         return
diff --git a/libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py b/libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py
index 561adab27..c137d59b9 100644
--- a/libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py
+++ b/libraries/botbuilder-core/botbuilder/core/auto_save_state_middleware.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from typing import Awaitable, Callable, List, Union
 
 from .bot_state import BotState
diff --git a/libraries/botbuilder-core/botbuilder/core/bot_state_set.py b/libraries/botbuilder-core/botbuilder/core/bot_state_set.py
index 8a86aaba0..99016af48 100644
--- a/libraries/botbuilder-core/botbuilder/core/bot_state_set.py
+++ b/libraries/botbuilder-core/botbuilder/core/bot_state_set.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from asyncio import wait
 from typing import List
 from .bot_state import BotState
diff --git a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py
index d1c6f77e6..2d7069492 100644
--- a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py
+++ b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service_exception_middleware.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from aiohttp.web import (
     middleware,
     HTTPNotImplemented,
diff --git a/libraries/botbuilder-core/botbuilder/core/private_conversation_state.py b/libraries/botbuilder-core/botbuilder/core/private_conversation_state.py
index 6b13bc5f5..137d57b0a 100644
--- a/libraries/botbuilder-core/botbuilder/core/private_conversation_state.py
+++ b/libraries/botbuilder-core/botbuilder/core/private_conversation_state.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from .bot_state import BotState
 from .turn_context import TurnContext
 from .storage import Storage
diff --git a/libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py b/libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py
index 42846b086..ea10e3fac 100644
--- a/libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py
+++ b/libraries/botbuilder-core/botbuilder/core/show_typing_middleware.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import time
 from functools import wraps
 from typing import Awaitable, Callable
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py
index 1a9fd36bb..23d907e09 100644
--- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py
+++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from botbuilder.schema import Activity
 from botbuilder.schema.teams import NotificationInfo, TeamsChannelData, TeamInfo
 
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py
index 174f7e9b8..841a41f0e 100644
--- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py
+++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py
@@ -58,7 +58,7 @@ async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse:
                 not turn_context.activity.name
                 and turn_context.activity.channel_id == Channels.ms_teams
             ):
-                return await self.on_teams_card_action_invoke_activity(turn_context)
+                return await self.on_teams_card_action_invoke(turn_context)
 
             if turn_context.activity.name == "signin/verifyState":
                 await self.on_teams_signin_verify_state(turn_context)
@@ -174,7 +174,7 @@ async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse:
         except _InvokeResponseException as err:
             return err.create_invoke_response()
 
-    async def on_teams_card_action_invoke_activity(
+    async def on_teams_card_action_invoke(
         self, turn_context: TurnContext
     ) -> InvokeResponse:
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
@@ -188,13 +188,13 @@ async def on_teams_file_consent(
         file_consent_card_response: FileConsentCardResponse,
     ) -> InvokeResponse:
         if file_consent_card_response.action == "accept":
-            await self.on_teams_file_consent_accept_activity(
+            await self.on_teams_file_consent_accept(
                 turn_context, file_consent_card_response
             )
             return self._create_invoke_response()
 
         if file_consent_card_response.action == "decline":
-            await self.on_teams_file_consent_decline_activity(
+            await self.on_teams_file_consent_decline(
                 turn_context, file_consent_card_response
             )
             return self._create_invoke_response()
@@ -204,14 +204,14 @@ async def on_teams_file_consent(
             f"{file_consent_card_response.action} is not a supported Action.",
         )
 
-    async def on_teams_file_consent_accept_activity(  # pylint: disable=unused-argument
+    async def on_teams_file_consent_accept(  # pylint: disable=unused-argument
         self,
         turn_context: TurnContext,
         file_consent_card_response: FileConsentCardResponse,
     ):
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
 
-    async def on_teams_file_consent_decline_activity(  # pylint: disable=unused-argument
+    async def on_teams_file_consent_decline(  # pylint: disable=unused-argument
         self,
         turn_context: TurnContext,
         file_consent_card_response: FileConsentCardResponse,
@@ -242,17 +242,17 @@ async def on_teams_messaging_extension_submit_action_dispatch(
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ) -> MessagingExtensionActionResponse:
         if not action.bot_message_preview_action:
-            return await self.on_teams_messaging_extension_submit_action_activity(
+            return await self.on_teams_messaging_extension_submit_action(
                 turn_context, action
             )
 
         if action.bot_message_preview_action == "edit":
-            return await self.on_teams_messaging_extension_bot_message_preview_edit_activity(
+            return await self.on_teams_messaging_extension_bot_message_preview_edit(
                 turn_context, action
             )
 
         if action.bot_message_preview_action == "send":
-            return await self.on_teams_messaging_extension_bot_message_preview_send_activity(
+            return await self.on_teams_messaging_extension_bot_message_preview_send(
                 turn_context, action
             )
 
@@ -261,17 +261,17 @@ async def on_teams_messaging_extension_submit_action_dispatch(
             body=f"{action.bot_message_preview_action} is not a supported BotMessagePreviewAction",
         )
 
-    async def on_teams_messaging_extension_bot_message_preview_edit_activity(  # pylint: disable=unused-argument
-        self, turn_context: TurnContext, action
+    async def on_teams_messaging_extension_bot_message_preview_edit(  # pylint: disable=unused-argument
+        self, turn_context: TurnContext, action: MessagingExtensionAction
     ) -> MessagingExtensionActionResponse:
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
 
-    async def on_teams_messaging_extension_bot_message_preview_send_activity(  # pylint: disable=unused-argument
-        self, turn_context: TurnContext, action
+    async def on_teams_messaging_extension_bot_message_preview_send(  # pylint: disable=unused-argument
+        self, turn_context: TurnContext, action: MessagingExtensionAction
     ) -> MessagingExtensionActionResponse:
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
 
-    async def on_teams_messaging_extension_submit_action_activity(  # pylint: disable=unused-argument
+    async def on_teams_messaging_extension_submit_action(  # pylint: disable=unused-argument
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ) -> MessagingExtensionActionResponse:
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
@@ -313,12 +313,12 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
                 turn_context.activity.channel_data
             )
             if turn_context.activity.members_added:
-                return await self.on_teams_members_added_dispatch_activity(
+                return await self.on_teams_members_added_dispatch(
                     turn_context.activity.members_added, channel_data.team, turn_context
                 )
 
             if turn_context.activity.members_removed:
-                return await self.on_teams_members_removed_dispatch_activity(
+                return await self.on_teams_members_removed_dispatch(
                     turn_context.activity.members_removed,
                     channel_data.team,
                     turn_context,
@@ -326,28 +326,27 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
 
             if channel_data:
                 if channel_data.event_type == "channelCreated":
-                    return await self.on_teams_channel_created_activity(
+                    return await self.on_teams_channel_created(
                         ChannelInfo().deserialize(channel_data.channel),
                         channel_data.team,
                         turn_context,
                     )
                 if channel_data.event_type == "channelDeleted":
-                    return await self.on_teams_channel_deleted_activity(
+                    return await self.on_teams_channel_deleted(
                         channel_data.channel, channel_data.team, turn_context
                     )
                 if channel_data.event_type == "channelRenamed":
-                    return await self.on_teams_channel_renamed_activity(
+                    return await self.on_teams_channel_renamed(
                         channel_data.channel, channel_data.team, turn_context
                     )
                 if channel_data.event_type == "teamRenamed":
                     return await self.on_teams_team_renamed_activity(
                         channel_data.team, turn_context
                     )
-                return await super().on_conversation_update_activity(turn_context)
 
         return await super().on_conversation_update_activity(turn_context)
 
-    async def on_teams_channel_created_activity(  # pylint: disable=unused-argument
+    async def on_teams_channel_created(  # pylint: disable=unused-argument
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
         return
@@ -357,7 +356,7 @@ async def on_teams_team_renamed_activity(  # pylint: disable=unused-argument
     ):
         return
 
-    async def on_teams_members_added_dispatch_activity(  # pylint: disable=unused-argument
+    async def on_teams_members_added_dispatch(  # pylint: disable=unused-argument
         self,
         members_added: [ChannelAccount],
         team_info: TeamInfo,
@@ -387,11 +386,11 @@ async def on_teams_members_added_dispatch_activity(  # pylint: disable=unused-ar
                     )
                     team_members_added.append(new_teams_channel_account)
 
-        return await self.on_teams_members_added_activity(
+        return await self.on_teams_members_added(
             team_members_added, team_info, turn_context
         )
 
-    async def on_teams_members_added_activity(  # pylint: disable=unused-argument
+    async def on_teams_members_added(  # pylint: disable=unused-argument
         self,
         teams_members_added: [TeamsChannelAccount],
         team_info: TeamInfo,
@@ -405,7 +404,7 @@ async def on_teams_members_added_activity(  # pylint: disable=unused-argument
             teams_members_added, turn_context
         )
 
-    async def on_teams_members_removed_dispatch_activity(  # pylint: disable=unused-argument
+    async def on_teams_members_removed_dispatch(  # pylint: disable=unused-argument
         self,
         members_removed: [ChannelAccount],
         team_info: TeamInfo,
@@ -421,11 +420,9 @@ async def on_teams_members_removed_dispatch_activity(  # pylint: disable=unused-
                 TeamsChannelAccount().deserialize(new_account_json)
             )
 
-        return await self.on_teams_members_removed_activity(
-            teams_members_removed, turn_context
-        )
+        return await self.on_teams_members_removed(teams_members_removed, turn_context)
 
-    async def on_teams_members_removed_activity(
+    async def on_teams_members_removed(
         self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext
     ):
         members_removed = [
@@ -434,12 +431,12 @@ async def on_teams_members_removed_activity(
         ]
         return await super().on_members_removed_activity(members_removed, turn_context)
 
-    async def on_teams_channel_deleted_activity(  # pylint: disable=unused-argument
+    async def on_teams_channel_deleted(  # pylint: disable=unused-argument
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
         return  # Task.CompleteTask
 
-    async def on_teams_channel_renamed_activity(  # pylint: disable=unused-argument
+    async def on_teams_channel_renamed(  # pylint: disable=unused-argument
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
         return  # Task.CompleteTask
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py
index f9e8c65e8..4fd3c8ed4 100644
--- a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py
+++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from inspect import getmembers
 from typing import Type
 from enum import Enum
diff --git a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py
index d9eabcb68..8de03909c 100644
--- a/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py
+++ b/libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py
@@ -35,11 +35,11 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
         self.record.append("on_conversation_update_activity")
         return await super().on_conversation_update_activity(turn_context)
 
-    async def on_teams_members_removed_activity(
+    async def on_teams_members_removed(
         self, teams_members_removed: [TeamsChannelAccount], turn_context: TurnContext
     ):
-        self.record.append("on_teams_members_removed_activity")
-        return await super().on_teams_members_removed_activity(
+        self.record.append("on_teams_members_removed")
+        return await super().on_teams_members_removed(
             teams_members_removed, turn_context
         )
 
@@ -59,27 +59,27 @@ async def on_unrecognized_activity_type(self, turn_context: TurnContext):
         self.record.append("on_unrecognized_activity_type")
         return await super().on_unrecognized_activity_type(turn_context)
 
-    async def on_teams_channel_created_activity(
+    async def on_teams_channel_created(
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
-        self.record.append("on_teams_channel_created_activity")
-        return await super().on_teams_channel_created_activity(
+        self.record.append("on_teams_channel_created")
+        return await super().on_teams_channel_created(
             channel_info, team_info, turn_context
         )
 
-    async def on_teams_channel_renamed_activity(
+    async def on_teams_channel_renamed(
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
-        self.record.append("on_teams_channel_renamed_activity")
-        return await super().on_teams_channel_renamed_activity(
+        self.record.append("on_teams_channel_renamed")
+        return await super().on_teams_channel_renamed(
             channel_info, team_info, turn_context
         )
 
-    async def on_teams_channel_deleted_activity(
+    async def on_teams_channel_deleted(
         self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext
     ):
-        self.record.append("on_teams_channel_deleted_activity")
-        return await super().on_teams_channel_renamed_activity(
+        self.record.append("on_teams_channel_deleted")
+        return await super().on_teams_channel_renamed(
             channel_info, team_info, turn_context
         )
 
@@ -107,23 +107,23 @@ async def on_teams_file_consent(
             turn_context, file_consent_card_response
         )
 
-    async def on_teams_file_consent_accept_activity(
+    async def on_teams_file_consent_accept(
         self,
         turn_context: TurnContext,
         file_consent_card_response: FileConsentCardResponse,
     ):
-        self.record.append("on_teams_file_consent_accept_activity")
-        return await super().on_teams_file_consent_accept_activity(
+        self.record.append("on_teams_file_consent_accept")
+        return await super().on_teams_file_consent_accept(
             turn_context, file_consent_card_response
         )
 
-    async def on_teams_file_consent_decline_activity(
+    async def on_teams_file_consent_decline(
         self,
         turn_context: TurnContext,
         file_consent_card_response: FileConsentCardResponse,
     ):
-        self.record.append("on_teams_file_consent_decline_activity")
-        return await super().on_teams_file_consent_decline_activity(
+        self.record.append("on_teams_file_consent_decline")
+        return await super().on_teams_file_consent_decline(
             turn_context, file_consent_card_response
         )
 
@@ -153,31 +153,27 @@ async def on_teams_messaging_extension_submit_action_dispatch(
             turn_context, action
         )
 
-    async def on_teams_messaging_extension_submit_action_activity(
+    async def on_teams_messaging_extension_submit_action(
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ):
-        self.record.append("on_teams_messaging_extension_submit_action_activity")
-        return await super().on_teams_messaging_extension_submit_action_activity(
+        self.record.append("on_teams_messaging_extension_submit_action")
+        return await super().on_teams_messaging_extension_submit_action(
             turn_context, action
         )
 
-    async def on_teams_messaging_extension_bot_message_preview_edit_activity(
+    async def on_teams_messaging_extension_bot_message_preview_edit(
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ):
-        self.record.append(
-            "on_teams_messaging_extension_bot_message_preview_edit_activity"
-        )
-        return await super().on_teams_messaging_extension_bot_message_preview_edit_activity(
+        self.record.append("on_teams_messaging_extension_bot_message_preview_edit")
+        return await super().on_teams_messaging_extension_bot_message_preview_edit(
             turn_context, action
         )
 
-    async def on_teams_messaging_extension_bot_message_preview_send_activity(
+    async def on_teams_messaging_extension_bot_message_preview_send(
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ):
-        self.record.append(
-            "on_teams_messaging_extension_bot_message_preview_send_activity"
-        )
-        return await super().on_teams_messaging_extension_bot_message_preview_send_activity(
+        self.record.append("on_teams_messaging_extension_bot_message_preview_send")
+        return await super().on_teams_messaging_extension_bot_message_preview_send(
             turn_context, action
         )
 
@@ -268,7 +264,7 @@ async def test_on_teams_channel_created_activity(self):
         # Assert
         assert len(bot.record) == 2
         assert bot.record[0] == "on_conversation_update_activity"
-        assert bot.record[1] == "on_teams_channel_created_activity"
+        assert bot.record[1] == "on_teams_channel_created"
 
     async def test_on_teams_channel_renamed_activity(self):
         # arrange
@@ -290,7 +286,7 @@ async def test_on_teams_channel_renamed_activity(self):
         # Assert
         assert len(bot.record) == 2
         assert bot.record[0] == "on_conversation_update_activity"
-        assert bot.record[1] == "on_teams_channel_renamed_activity"
+        assert bot.record[1] == "on_teams_channel_renamed"
 
     async def test_on_teams_channel_deleted_activity(self):
         # arrange
@@ -312,7 +308,7 @@ async def test_on_teams_channel_deleted_activity(self):
         # Assert
         assert len(bot.record) == 2
         assert bot.record[0] == "on_conversation_update_activity"
-        assert bot.record[1] == "on_teams_channel_deleted_activity"
+        assert bot.record[1] == "on_teams_channel_deleted"
 
     async def test_on_teams_team_renamed_activity(self):
         # arrange
@@ -361,7 +357,7 @@ async def test_on_teams_members_removed_activity(self):
         # Assert
         assert len(bot.record) == 2
         assert bot.record[0] == "on_conversation_update_activity"
-        assert bot.record[1] == "on_teams_members_removed_activity"
+        assert bot.record[1] == "on_teams_members_removed"
 
     async def test_on_signin_verify_state(self):
         # arrange
@@ -396,7 +392,7 @@ async def test_on_file_consent_accept_activity(self):
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_file_consent"
-        assert bot.record[2] == "on_teams_file_consent_accept_activity"
+        assert bot.record[2] == "on_teams_file_consent_accept"
 
     async def test_on_file_consent_decline_activity(self):
         # Arrange
@@ -416,7 +412,7 @@ async def test_on_file_consent_decline_activity(self):
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_file_consent"
-        assert bot.record[2] == "on_teams_file_consent_decline_activity"
+        assert bot.record[2] == "on_teams_file_consent_decline"
 
     async def test_on_file_consent_bad_action_activity(self):
         # Arrange
@@ -502,10 +498,7 @@ async def test_on_teams_messaging_extension_bot_message_preview_edit_activity(se
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch"
-        assert (
-            bot.record[2]
-            == "on_teams_messaging_extension_bot_message_preview_edit_activity"
-        )
+        assert bot.record[2] == "on_teams_messaging_extension_bot_message_preview_edit"
 
     async def test_on_teams_messaging_extension_bot_message_send_activity(self):
         # Arrange
@@ -533,10 +526,7 @@ async def test_on_teams_messaging_extension_bot_message_send_activity(self):
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch"
-        assert (
-            bot.record[2]
-            == "on_teams_messaging_extension_bot_message_preview_send_activity"
-        )
+        assert bot.record[2] == "on_teams_messaging_extension_bot_message_preview_send"
 
     async def test_on_teams_messaging_extension_bot_message_send_activity_with_none(
         self,
@@ -566,7 +556,7 @@ async def test_on_teams_messaging_extension_bot_message_send_activity_with_none(
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch"
-        assert bot.record[2] == "on_teams_messaging_extension_submit_action_activity"
+        assert bot.record[2] == "on_teams_messaging_extension_submit_action"
 
     async def test_on_teams_messaging_extension_bot_message_send_activity_with_empty_string(
         self,
@@ -596,7 +586,7 @@ async def test_on_teams_messaging_extension_bot_message_send_activity_with_empty
         assert len(bot.record) == 3
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_messaging_extension_submit_action_dispatch"
-        assert bot.record[2] == "on_teams_messaging_extension_submit_action_activity"
+        assert bot.record[2] == "on_teams_messaging_extension_submit_action"
 
     async def test_on_teams_messaging_extension_fetch_task(self):
         # Arrange
diff --git a/libraries/botbuilder-core/tests/teams/test_teams_extension.py b/libraries/botbuilder-core/tests/teams/test_teams_extension.py
index 8ac96a491..e4ebb4449 100644
--- a/libraries/botbuilder-core/tests/teams/test_teams_extension.py
+++ b/libraries/botbuilder-core/tests/teams/test_teams_extension.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import aiounittest
 
 from botbuilder.schema import Activity
diff --git a/libraries/botbuilder-core/tests/teams/test_teams_helper.py b/libraries/botbuilder-core/tests/teams/test_teams_helper.py
index 21f074a73..782973f0a 100644
--- a/libraries/botbuilder-core/tests/teams/test_teams_helper.py
+++ b/libraries/botbuilder-core/tests/teams/test_teams_helper.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import aiounittest
 
 from botbuilder.core.teams.teams_helper import deserializer_helper
diff --git a/libraries/botbuilder-testing/botbuilder/testing/storage_base_tests.py b/libraries/botbuilder-testing/botbuilder/testing/storage_base_tests.py
index defa5040f..afd17b905 100644
--- a/libraries/botbuilder-testing/botbuilder/testing/storage_base_tests.py
+++ b/libraries/botbuilder-testing/botbuilder/testing/storage_base_tests.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 """
 Base tests that all storage providers should implement in their own tests.
 They handle the storage-based assertions, internally.
diff --git a/samples/01.console-echo/bot.py b/samples/01.console-echo/bot.py
index 226f0d963..d54eb0394 100644
--- a/samples/01.console-echo/bot.py
+++ b/samples/01.console-echo/bot.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from sys import exit
 
 
diff --git a/scenarios/link-unfurling/app.py b/scenarios/link-unfurling/app.py
index 5be8bb376..8bbf90feb 100644
--- a/scenarios/link-unfurling/app.py
+++ b/scenarios/link-unfurling/app.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 import json
 import sys
 from datetime import datetime
diff --git a/scenarios/message-reactions/activity_log.py b/scenarios/message-reactions/activity_log.py
index e4dbe477a..0ef5a837d 100644
--- a/scenarios/message-reactions/activity_log.py
+++ b/scenarios/message-reactions/activity_log.py
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 from botbuilder.core import MemoryStorage
 from botbuilder.schema import Activity