diff --git a/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg b/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg
index b3b746cdc..600223eef 100644
--- a/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg
+++ b/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg
@@ -17,7 +17,7 @@
             "actions": [
                 {
                     "$kind": "Microsoft.Ask",
-                    "activity": "@{callAsk()}",
+                    "activity": "@\{template(concat('Ask',$PropertyToRemember))}",
                     "expectedProperties": 
                         "createArray($PropertyToRemember)"
                     
@@ -26,7 +26,4 @@
         }
     ]
 }
-```
-
-# callAsk()
-- @\{template(concat('Ask',$PropertyToRemember))}
\ No newline at end of file
+```
\ No newline at end of file
diff --git a/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg b/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg
index 20054e716..d6bcbc452 100644
--- a/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg
+++ b/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg
@@ -13,6 +13,3 @@
     ]
 }
 ```
-
-# callChooseProperty
-- @\{chooseProperty()}
\ No newline at end of file
diff --git a/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg b/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg
index 22ec1a833..712819eb0 100644
--- a/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg
+++ b/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg
@@ -22,7 +22,7 @@
             "elseActions":[
                 {
                     "$kind": "Microsoft.Ask",
-                    "activity": "@{callChooseProperty()}",
+                    "activity": "@\{chooseProperty()}",
                     "expectedProperties": [
                         "PropertyToChange"
                     ]
@@ -32,6 +32,3 @@
     ]
 }
 ```
-
-# callChooseProperty
-- @\{chooseProperty()}
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-ageEntity.dialog.lg b/packages/dialog/templates/assign-ageEntity.dialog.lg
index b6e0d74d0..327240570 100644
--- a/packages/dialog/templates/assign-ageEntity.dialog.lg
+++ b/packages/dialog/templates/assign-ageEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@age.number), ' ', @age.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage()
-- @\{setObjectPropertyMessage('@{property}', concat(string(@age.number), ' ', @age.units))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-datetimeEntity.dialog.lg b/packages/dialog/templates/assign-datetimeEntity.dialog.lg
index 5620845d1..18c4be0b1 100644
--- a/packages/dialog/templates/assign-datetimeEntity.dialog.lg
+++ b/packages/dialog/templates/assign-datetimeEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(@datetime.type, ' ', string(@datetime.timex)))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(@datetime.type, ' ', string(@datetime.timex)))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-dimensionEntity.dialog.lg b/packages/dialog/templates/assign-dimensionEntity.dialog.lg
index 23b42a5a0..92aae352f 100644
--- a/packages/dialog/templates/assign-dimensionEntity.dialog.lg
+++ b/packages/dialog/templates/assign-dimensionEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}',concat(string(@dimension.number), ' ', @dimension.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}',concat(string(@dimension.number), ' ', @dimension.units))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-geographyV2Entity.dialog.lg b/packages/dialog/templates/assign-geographyV2Entity.dialog.lg
index 23d1800d9..b175f4900 100644
--- a/packages/dialog/templates/assign-geographyV2Entity.dialog.lg
+++ b/packages/dialog/templates/assign-geographyV2Entity.dialog.lg
@@ -12,7 +12,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(@geographyV2.type, ' ', @geographyV2.location))}
+"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +29,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(@geographyV2.type, ' ', @geographyV2.location))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-moneyEntity.dialog.lg b/packages/dialog/templates/assign-moneyEntity.dialog.lg
index 8a9387233..ff66a9211 100644
--- a/packages/dialog/templates/assign-moneyEntity.dialog.lg
+++ b/packages/dialog/templates/assign-moneyEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@money.number), ' ', @money.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@money.number), ' ', @money.units))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg b/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg
index e1cde4463..3f440554f 100644
--- a/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg
+++ b/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@ordinalV2.offset), ' ', @ordinalV2.relativeTo))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@ordinalV2.offset), ' ', @ordinalV2.relativeTo))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/assign-temperatureEntity.dialog.lg b/packages/dialog/templates/assign-temperatureEntity.dialog.lg
index 2d6ac907f..d67bdd1de 100644
--- a/packages/dialog/templates/assign-temperatureEntity.dialog.lg
+++ b/packages/dialog/templates/assign-temperatureEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@temperature.number), ' ', @temperature.units))}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@temperature.number), ' ', @temperature.units))}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/boolean-assign-boolean.dialog.lg b/packages/dialog/templates/boolean-assign-boolean.dialog.lg
index 0ffcddbfe..351a059a0 100644
--- a/packages/dialog/templates/boolean-assign-boolean.dialog.lg
+++ b/packages/dialog/templates/boolean-assign-boolean.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @boolean)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @boolean)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/boolean-missing.dialog.lg b/packages/dialog/templates/boolean-missing.dialog.lg
index f88e557dd..ae59d0eed 100644
--- a/packages/dialog/templates/boolean-missing.dialog.lg
+++ b/packages/dialog/templates/boolean-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [       
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,7 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/enum-assign-enumEntity.dialog.lg b/packages/dialog/templates/enum-assign-enumEntity.dialog.lg
index ce40e6f03..5038e68d9 100644
--- a/packages/dialog/templates/enum-assign-enumEntity.dialog.lg
+++ b/packages/dialog/templates/enum-assign-enumEntity.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @@{property}Entity)}"
         },    
         {
             "$kind": "Microsoft.SetProperty",
@@ -22,7 +22,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @@{property}Entity)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/enum-missing.dialog.lg b/packages/dialog/templates/enum-missing.dialog.lg
index f88e557dd..ae59d0eed 100644
--- a/packages/dialog/templates/enum-missing.dialog.lg
+++ b/packages/dialog/templates/enum-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [       
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,7 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/enumEntity-choose.dialog.lg b/packages/dialog/templates/enumEntity-choose.dialog.lg
index fa8fa09bb..b7043d8d7 100644
--- a/packages/dialog/templates/enumEntity-choose.dialog.lg
+++ b/packages/dialog/templates/enumEntity-choose.dialog.lg
@@ -10,12 +10,9 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callChoose()}",
+            "activity": "@\{choose@{property}Entity()}",
             "expectedProperties": ["@{property}"]
         }
     ]
 }
 ```
-
-# callChoose
-- @\{choose@{property}Entity()}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-BeginDialog.dialog.lg b/packages/dialog/templates/library-BeginDialog.dialog.lg
index 1d03a3d98..7a592197c 100644
--- a/packages/dialog/templates/library-BeginDialog.dialog.lg
+++ b/packages/dialog/templates/library-BeginDialog.dialog.lg
@@ -7,11 +7,9 @@
     "actions":  [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callWelcome()}"           
+            "activity": "@\{welcome()}"           
         }
     ]
 }
 ```
 
-# callWelcome
-- @\{welcome()}
diff --git a/packages/dialog/templates/library-CancelIntent.dialog.lg b/packages/dialog/templates/library-CancelIntent.dialog.lg
index e242d788b..9eb9c45c3 100644
--- a/packages/dialog/templates/library-CancelIntent.dialog.lg
+++ b/packages/dialog/templates/library-CancelIntent.dialog.lg
@@ -8,7 +8,7 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callCancel()}",
+            "activity": "@\{cancel()}",
             "expectedProperties": [
                 "CancelConfirmation"                    
             ]           
@@ -16,6 +16,3 @@
     ]
 }
 ```
-
-# callCancel
-- @\{cancel()}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-ChooseProperty.dialog.lg b/packages/dialog/templates/library-ChooseProperty.dialog.lg
index 11a732def..29aa025b7 100644
--- a/packages/dialog/templates/library-ChooseProperty.dialog.lg
+++ b/packages/dialog/templates/library-ChooseProperty.dialog.lg
@@ -6,12 +6,9 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callChooseProperties()}",
+            "activity": "@\{chooseProperties()}",
             "expectedProperties": ["PropertyToChange"]
         }
     ]
 }
 ```
-
-# callChooseProperties
-- @\{chooseProperties()}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-CompleteConfirmation.dialog.lg b/packages/dialog/templates/library-CompleteConfirmation.dialog.lg
index 9604f2af3..3c67ba665 100644
--- a/packages/dialog/templates/library-CompleteConfirmation.dialog.lg
+++ b/packages/dialog/templates/library-CompleteConfirmation.dialog.lg
@@ -7,11 +7,11 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callReadForm()}"
+            "activity": "@\{readForm('@{schemaName}')}"
         },
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callConfirmChange()}",
+            "activity": "@\{confirmChange()}",
             "expectedProperties": [
                 "CompleteConfirmation"
             ]
@@ -19,9 +19,3 @@
     ]
 }
 ```
-
-# callReadForm
-- @\{readForm('@{schemaName}')}
-
-# callConfirmChange
-- @\{confirmChange()}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-HelpIntent.dialog.lg b/packages/dialog/templates/library-HelpIntent.dialog.lg
index 89513b14c..5afd78658 100644
--- a/packages/dialog/templates/library-HelpIntent.dialog.lg
+++ b/packages/dialog/templates/library-HelpIntent.dialog.lg
@@ -7,11 +7,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callHelp()}"           
+            "activity": "@\{help(@PropertyName)}"           
         }
     ]
 }
 ```
-
-# callHelp
-- @\{help(@PropertyName)}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-NotUnderstood.dialog.lg b/packages/dialog/templates/library-NotUnderstood.dialog.lg
index 13330c48e..1a586c43e 100644
--- a/packages/dialog/templates/library-NotUnderstood.dialog.lg
+++ b/packages/dialog/templates/library-NotUnderstood.dialog.lg
@@ -8,11 +8,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callNotUnderstood()}"           
+            "activity": "@\{notUnderstood()}"           
         }
     ]
 }
 ```
-
-# callNotUnderstood
-- @\{notUnderstood()}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg b/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg
index 55b50489b..780b58161 100644
--- a/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg
+++ b/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg
@@ -7,7 +7,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callTextProperty()}"           
+            "activity": "@\{textProperty(@PropertyName)}"           
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -16,7 +16,7 @@
         },
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callConfirmChangeProperty()}",
+            "activity": "@\{confirmChangeProperty(@PropertyName)}",
             "expectedProperties": [
                 "ChangePropertyConfirmation"
             ]
@@ -24,9 +24,3 @@
     ]
 }
 ```
-
-# callTextProperty
-- @\{textProperty(@PropertyName)}
-
-# callConfirmChangeProperty
-- @\{confirmChangeProperty(@PropertyName)}
\ No newline at end of file
diff --git a/packages/dialog/templates/library-triggerIntent.dialog.lg b/packages/dialog/templates/library-triggerIntent.dialog.lg
index 452c4e367..b58093a04 100644
--- a/packages/dialog/templates/library-triggerIntent.dialog.lg
+++ b/packages/dialog/templates/library-triggerIntent.dialog.lg
@@ -11,11 +11,9 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callNotUnderstood()}"           
+            "activity": "@\{notUnderstood()}"           
         }
     ]
 }
 ```
-
-# callNotUnderstood
-- @\{notUnderstood()}
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/packages/dialog/templates/number-assign-dimension.dialog.lg b/packages/dialog/templates/number-assign-dimension.dialog.lg
index 4ab0b5299..d913ead75 100644
--- a/packages/dialog/templates/number-assign-dimension.dialog.lg
+++ b/packages/dialog/templates/number-assign-dimension.dialog.lg
@@ -15,7 +15,7 @@
             "actions":[
                 {
                     "$kind": "Microsoft.SendActivity",
-                    "activity": "@{callSetMessage()}"
+                    "activity": "@\{setObjectPropertyMessage('@{property}',string(@dimension.number))}"
                 }, 
                 {
                     "$kind": "Microsoft.SetProperty",
@@ -26,7 +26,7 @@
             "elseActions":[
                 {
                     "$kind": "Microsoft.SendActivity",
-                    "activity": "@{callUnitsAlert()}"
+                    "activity": "@\{unitsAlert('@{property}')}"
                 }
             ]
         }
@@ -34,10 +34,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}',string(@dimension.number))}
-
-# callUnitsAlert
-- @\{unitsAlert('@{property}')}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/number-assign-number.dialog.lg b/packages/dialog/templates/number-assign-number.dialog.lg
index 96c41cdc5..4b82a9902 100644
--- a/packages/dialog/templates/number-assign-number.dialog.lg
+++ b/packages/dialog/templates/number-assign-number.dialog.lg
@@ -16,13 +16,13 @@
             "actions":[
                 {
                     "$kind": "Microsoft.SendActivity",
-                    "activity": "@{callNumberAlert()}"
+                    "activity": "@\{numberValidation('@{property}', @number)}"
                 }                    
             ],
             "elseActions":[
                 {
                     "$kind": "Microsoft.SendActivity",
-                    "activity": "@{callSetMessage()}"
+                    "activity": "@\{setPropertyMessage('@{property}', @number)}"
                 },
                 {
                     "$kind": "Microsoft.SetProperty",
@@ -36,10 +36,4 @@
 }
 ```
 
-# callNumberAlert
-- @\{numberValidation('@{property}', @number)}
-
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @number)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/number-missing.dialog.lg b/packages/dialog/templates/number-missing.dialog.lg
index 8bbeb47ed..0df3d1b51 100644
--- a/packages/dialog/templates/number-missing.dialog.lg
+++ b/packages/dialog/templates/number-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [        
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,7 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-boolean.dialog.lg b/packages/dialog/templates/string-assign-boolean.dialog.lg
index 0ffcddbfe..351a059a0 100644
--- a/packages/dialog/templates/string-assign-boolean.dialog.lg
+++ b/packages/dialog/templates/string-assign-boolean.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @boolean)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @boolean)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-email.dialog.lg b/packages/dialog/templates/string-assign-email.dialog.lg
index 8a2c9df85..8ce76b10c 100644
--- a/packages/dialog/templates/string-assign-email.dialog.lg
+++ b/packages/dialog/templates/string-assign-email.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @email)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @email)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-keyPhrase.dialog.lg b/packages/dialog/templates/string-assign-keyPhrase.dialog.lg
index 453587365..f36c30630 100644
--- a/packages/dialog/templates/string-assign-keyPhrase.dialog.lg
+++ b/packages/dialog/templates/string-assign-keyPhrase.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @keyPhrase)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @keyPhrase)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-number.dialog.lg b/packages/dialog/templates/string-assign-number.dialog.lg
index 8e52dc39e..4255cc7c4 100644
--- a/packages/dialog/templates/string-assign-number.dialog.lg
+++ b/packages/dialog/templates/string-assign-number.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @number)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @number)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-ordinal.dialog.lg b/packages/dialog/templates/string-assign-ordinal.dialog.lg
index bde8e9520..e8adf90d8 100644
--- a/packages/dialog/templates/string-assign-ordinal.dialog.lg
+++ b/packages/dialog/templates/string-assign-ordinal.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @ordinal)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @ordinal)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-percentage.dialog.lg b/packages/dialog/templates/string-assign-percentage.dialog.lg
index 47b88474d..272d6cb3a 100644
--- a/packages/dialog/templates/string-assign-percentage.dialog.lg
+++ b/packages/dialog/templates/string-assign-percentage.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @percentage)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @percentage)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-personName.dialog.lg b/packages/dialog/templates/string-assign-personName.dialog.lg
index a93859073..6c262965e 100644
--- a/packages/dialog/templates/string-assign-personName.dialog.lg
+++ b/packages/dialog/templates/string-assign-personName.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @personName)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @personName)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-phonenumber.dialog.lg b/packages/dialog/templates/string-assign-phonenumber.dialog.lg
index 6d4d84c30..ca7baeb36 100644
--- a/packages/dialog/templates/string-assign-phonenumber.dialog.lg
+++ b/packages/dialog/templates/string-assign-phonenumber.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @phonenumber)}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @phonenumber)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-string.dialog.lg b/packages/dialog/templates/string-assign-string.dialog.lg
index 5dd035fb1..8adbf4bdb 100644
--- a/packages/dialog/templates/string-assign-string.dialog.lg
+++ b/packages/dialog/templates/string-assign-string.dialog.lg
@@ -19,13 +19,13 @@
                     "actions":[
                         {
                             "$kind": "Microsoft.SendActivity",
-                            "activity": "@{callUnexpectedSet()}"
+                            "activity": "@\{unexpectedPropertySet('@{property}', @@{property}Entity)}"
                         }
                     ],
                     "elseActions":[
                         {
                             "$kind": "Microsoft.SendActivity",
-                            "activity": "@{callUnexpectedChange()}"
+                            "activity": "@\{unexpectedPropertyChange('@{property}', @@{property}Entity, $@{property})}"
                         }
                     ]
                 }                
@@ -40,10 +40,4 @@
 }
 ```
 
-# callUnexpectedSet
-- @\{unexpectedPropertySet('@{property}', @@{property}Entity)}
-
-# callUnexpectedChange
-- @\{unexpectedPropertyChange('@{property}', @@{property}Entity, $@{property})}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-url.dialog.lg b/packages/dialog/templates/string-assign-url.dialog.lg
index 7c5c9eb49..af7097bdf 100644
--- a/packages/dialog/templates/string-assign-url.dialog.lg
+++ b/packages/dialog/templates/string-assign-url.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @url)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -24,6 +24,6 @@
 ```
 
 # callSetMessage
-- @\{setPropertyMessage('@{property}', @url)}
+- 
 
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-assign-utterance.dialog.lg b/packages/dialog/templates/string-assign-utterance.dialog.lg
index c3e3e2669..125aa6f68 100644
--- a/packages/dialog/templates/string-assign-utterance.dialog.lg
+++ b/packages/dialog/templates/string-assign-utterance.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @utterance)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @utterance)}
-
 [generator.lg](generator.lg)
\ No newline at end of file
diff --git a/packages/dialog/templates/string-missing.dialog.lg b/packages/dialog/templates/string-missing.dialog.lg
index 5109c5ccb..1ac9d692d 100644
--- a/packages/dialog/templates/string-missing.dialog.lg
+++ b/packages/dialog/templates/string-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,10 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
-# callHelp
-- @\{help(@PropertyName)}
-
 [generator.lg](generator.lg)
\ No newline at end of file