diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index de8fb2216d..e15e51d81b 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -43,7 +43,7 @@ export function getDialog(dialogs: DialogInfo[], dialogId: string) {
 export const eventTypeKey: string = SDKTypes.OnDialogEvent;
 export const intentTypeKey: string = SDKTypes.OnIntent;
 export const activityTypeKey: string = SDKTypes.OnActivity;
-export const messageTypeKey: string = SDKTypes.OnMessageActivity;
+export const messageTypeKey: string = SDKTypes.OnMessageEventActivity;
 export const regexRecognizerKey: string = SDKTypes.RegexRecognizer;
 
 export function getFriendlyName(data) {
diff --git a/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts b/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts
index 0340a17bd9..9b2746aa16 100644
--- a/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts
+++ b/Composer/packages/extensions/obiformeditor/src/schema/uischema.ts
@@ -159,7 +159,7 @@ export const uiSchema: { [key in SDKTypes]?: UiSchema } = {
   [SDKTypes.OnInvokeActivity]: {
     ...triggerUiSchema,
   },
-  [SDKTypes.OnMessageReceivedActivity]: {
+  [SDKTypes.OnMessageActivity]: {
     ...triggerUiSchema,
   },
   [SDKTypes.OnMessageDeleteActivity]: {
diff --git a/Composer/packages/lib/shared/src/appschema.ts b/Composer/packages/lib/shared/src/appschema.ts
index 2def619dc6..e628b92879 100644
--- a/Composer/packages/lib/shared/src/appschema.ts
+++ b/Composer/packages/lib/shared/src/appschema.ts
@@ -2331,14 +2331,14 @@ export const appschema: OBISchema = {
         },
       },
     },
-    'Microsoft.OnMessageReceivedActivity': {
+    'Microsoft.OnMessageActivity': {
       $role: 'unionType(Microsoft.ITriggerCondition)',
       title: 'On MessageRecieved activity',
       description:
         "Actions to perform on receipt of an activity with type 'MessageRecieved'. Overrides Intent trigger.",
       type: 'object',
       properties: {
-        ...$properties(SDKTypes.OnMessageReceivedActivity),
+        ...$properties(SDKTypes.OnMessageActivity),
         condition: {
           $role: 'expression',
           title: 'Condition',
diff --git a/Composer/packages/lib/shared/src/labelMap.ts b/Composer/packages/lib/shared/src/labelMap.ts
index f1a03fd2b0..1b0e22827c 100644
--- a/Composer/packages/lib/shared/src/labelMap.ts
+++ b/Composer/packages/lib/shared/src/labelMap.ts
@@ -171,11 +171,11 @@ export const ConceptLabels: { [key in ConceptLabelKey]?: LabelOverride } = {
     title: formatMessage('Conversation invoked'),
     subtitle: formatMessage('Invoke activity'),
   },
-  [SDKTypes.OnMessageActivity]: {
+  [SDKTypes.OnMessageEventActivity]: {
     title: formatMessage('Message events'),
-    subtitle: formatMessage('Message recieved activity'),
+    subtitle: formatMessage('Message activity'),
   },
-  [SDKTypes.OnMessageReceivedActivity]: {
+  [SDKTypes.OnMessageActivity]: {
     title: formatMessage('Message received'),
     subtitle: formatMessage('Message recieved activity'),
   },
diff --git a/Composer/packages/lib/shared/src/types/schema.ts b/Composer/packages/lib/shared/src/types/schema.ts
index fa1330a206..6d4264d5a5 100644
--- a/Composer/packages/lib/shared/src/types/schema.ts
+++ b/Composer/packages/lib/shared/src/types/schema.ts
@@ -73,8 +73,8 @@ export enum SDKTypes {
   OnHandoffActivity = 'Microsoft.OnHandoffActivity',
   OnIntent = 'Microsoft.OnIntent',
   OnInvokeActivity = 'Microsoft.OnInvokeActivity',
+  OnMessageEventActivity = 'Microsoft.OnMessageEventActivity',
   OnMessageActivity = 'Microsoft.OnMessageActivity',
-  OnMessageReceivedActivity = 'Microsoft.OnMessageReceivedActivity',
   OnMessageDeleteActivity = 'Microsoft.OnMessageDeleteActivity',
   OnMessageReactionActivity = 'Microsoft.OnMessageReactionActivity',
   OnMessageUpdateActivity = 'Microsoft.OnMessageUpdateActivity',
diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts
index 31c92478b4..21d2cc9abe 100644
--- a/Composer/packages/lib/shared/src/viewUtils.ts
+++ b/Composer/packages/lib/shared/src/viewUtils.ts
@@ -106,7 +106,7 @@ export const dialogGroups: DialogGroupsMap = {
       SDKTypes.OnUnknownIntent,
       SDKTypes.OnDialogEvent,
       SDKTypes.OnActivity,
-      SDKTypes.OnMessageActivity,
+      SDKTypes.OnMessageEventActivity,
       SDKTypes.OnCustomEvent,
     ],
   },
@@ -129,7 +129,7 @@ export const dialogGroups: DialogGroupsMap = {
   [DialogGroup.MESSAGE_EVENTS]: {
     label: 'Message events',
     types: [
-      SDKTypes.OnMessageReceivedActivity,
+      SDKTypes.OnMessageActivity,
       SDKTypes.OnMessageDeleteActivity,
       SDKTypes.OnMessageReactionActivity,
       SDKTypes.OnMessageUpdateActivity,
diff --git a/Composer/packages/server/schemas/editor.schema b/Composer/packages/server/schemas/editor.schema
index 672349bee7..fbbf646a2d 100644
--- a/Composer/packages/server/schemas/editor.schema
+++ b/Composer/packages/server/schemas/editor.schema
@@ -199,7 +199,7 @@
       "title": "Conversation invoked",
       "subtitle": "Invoke activity"
     },
-    "Microsoft.OnMessageReceivedActivity": {
+    "Microsoft.OnMessageActivity": {
       "title": "Message recieved",
       "subtitle": "Message recieved activity"
     },
diff --git a/Composer/packages/server/schemas/sdk.schema b/Composer/packages/server/schemas/sdk.schema
index be2633ce59..6c02b6104c 100644
--- a/Composer/packages/server/schemas/sdk.schema
+++ b/Composer/packages/server/schemas/sdk.schema
@@ -351,9 +351,9 @@
             "$ref": "#/definitions/Microsoft.OnInvokeActivity"
         },
         {
-            "title": "Microsoft.OnMessageReceivedActivity",
+            "title": "Microsoft.OnMessageActivity",
             "description": "Actions to perform on receipt of an activity with type 'MessageReceived'. Overrides Intent trigger.",
-            "$ref": "#/definitions/Microsoft.OnMessageReceivedActivity"
+            "$ref": "#/definitions/Microsoft.OnMessageActivity"
         },
         {
             "title": "Microsoft.OnMessageDeleteActivity",
@@ -4891,9 +4891,9 @@
                     "$ref": "#/definitions/Microsoft.OnInvokeActivity"
                 },
                 {
-                    "title": "Microsoft.OnMessageReceivedActivity",
+                    "title": "Microsoft.OnMessageActivity",
                     "description": "Actions to perform on receipt of an activity with type 'Message'. Overrides Intent trigger.",
-                    "$ref": "#/definitions/Microsoft.OnMessageReceivedActivity"
+                    "$ref": "#/definitions/Microsoft.OnMessageActivity"
                 },
                 {
                     "title": "Microsoft.OnMessageDeleteActivity",
@@ -8184,7 +8184,7 @@
                 }
             ]
         },
-        "Microsoft.OnMessageReceivedActivity": {
+        "Microsoft.OnMessageActivity": {
             "$role": "union(Microsoft.ITriggerCondition)",
             "title": "On Message activity",
             "description": "Actions to perform on receipt of an activity with type 'Message'. Overrides Intent trigger.",
@@ -8195,7 +8195,7 @@
                     "description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
                     "type": "string",
                     "pattern": "^[a-zA-Z][a-zA-Z0-9.]*$",
-                    "const": "Microsoft.OnMessageReceivedActivity"
+                    "const": "Microsoft.OnMessageActivity"
                 },
                 "$copy": {
                     "title": "$copy",