diff --git a/docs-main/overview/understand/core-concepts.mdx b/docs-main/overview/understand/core-concepts.mdx
index d90a82bad..4488501ef 100644
--- a/docs-main/overview/understand/core-concepts.mdx
+++ b/docs-main/overview/understand/core-concepts.mdx
@@ -3,9 +3,9 @@ title: "Core Concepts"
 description: "Essential building blocks of Canton Network: parties, validators, synchronizers, and smart contracts"
 ---
 
-import DamlOverviewUnderstandCoreConceptsL183 from "/snippets/daml-docs/overview_understand_core-concepts_L183.mdx";
+import DamlPartyRolesAsset from "/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-asset-begin.mdx";
+import DamlPartyRolesTemplateStructure from "/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-template-structure-begin.mdx";
 import DamlOverviewUnderstandCoreConceptsL223 from "/snippets/daml-docs/overview_understand_core-concepts_L223.mdx";
-import DamlOverviewUnderstandCoreConceptsL44 from "/snippets/daml-docs/overview_understand_core-concepts_L44.mdx";
 
 
 Understanding Canton requires grasping four fundamental concepts: **parties**, **validator** node, **synchronizers**, and **templates** (smart contracts). This page introduces each and explains how they work together.
@@ -46,7 +46,7 @@ Unlike Ethereum addresses, parties create state on validators and have costs ass
 
 Parties interact with contracts in three roles:
 
-<DamlOverviewUnderstandCoreConceptsL44 />
+<DamlPartyRolesAsset />
 
 | Role | Can Create | Can See | Can Act |
 |------|------------|---------|---------|
@@ -171,7 +171,7 @@ Smart contracts in Canton are defined using **Daml**, a purpose-built language f
 
 ### Template Structure
 
-<DamlOverviewUnderstandCoreConceptsL183 />
+<DamlPartyRolesTemplateStructure />
 
 ### Contracts Are Immutable
 
diff --git a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L223.mdx b/docs-main/snippets/daml-docs/overview_understand_core-concepts_L223.mdx
index 87e97e54d..dce53f8d5 100644
--- a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L223.mdx
+++ b/docs-main/snippets/daml-docs/overview_understand_core-concepts_L223.mdx
@@ -1,6 +1,6 @@
 ```haskell
 -- Consuming: archives the contract
-choice Transfer : ContractId Token
+choice ChangeOwner : ContractId Token
   controller owner
   do create this with owner = newOwner
 
diff --git a/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-9-daml-test-intro-asset-multi-trade-fora-example-begin.mdx b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-9-daml-test-intro-asset-multi-trade-fora-example-begin.mdx
index bcca05b53..ef57ebf8e 100644
--- a/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-9-daml-test-intro-asset-multi-trade-fora-example-begin.mdx
+++ b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-9-daml-test-intro-asset-multi-trade-fora-example-begin.mdx
@@ -1,6 +1,6 @@
 ```haskell
-  [usdCid, chfCid] <- forA [usdCid, chfCid] (\cid -> submit alice do
-  exerciseCmd cid SetObservers with
-  newObservers = [bob]
-  )
+[usdCid, chfCid] <- forA [usdCid, chfCid] (\cid -> submit alice do
+    exerciseCmd cid SetObservers with
+      newObservers = [bob]
+    )
 ```
\ No newline at end of file
diff --git a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L44.mdx b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-asset-begin.mdx
similarity index 90%
rename from docs-main/snippets/daml-docs/overview_understand_core-concepts_L44.mdx
rename to docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-asset-begin.mdx
index 35a1deed5..89cf12116 100644
--- a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L44.mdx
+++ b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-asset-begin.mdx
@@ -8,8 +8,8 @@ template Asset
     signatory issuer        -- Must authorize creation; always sees contract
     observer owner, auditor -- Can see contract
 
-    choice Transfer : ContractId Asset
+    choice ChangeOwner : ContractId Asset
       with newOwner : Party
       controller owner      -- Only owner can exercise this choice
       do create this with owner = newOwner
-```
+```
\ No newline at end of file
diff --git a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L183.mdx b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-template-structure-begin.mdx
similarity index 87%
rename from docs-main/snippets/daml-docs/overview_understand_core-concepts_L183.mdx
rename to docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-template-structure-begin.mdx
index 44b0a4af9..3e20eb646 100644
--- a/docs-main/snippets/daml-docs/overview_understand_core-concepts_L183.mdx
+++ b/docs-main/snippets/external/daml/main/tutorials-smart-contracts-daml-daml-intro-choices-daml-party-roles-template-structure-begin.mdx
@@ -11,10 +11,10 @@ template Token
     observer owner
 
     -- Actions
-    choice Transfer : ContractId Token
+    choice ChangeOwner : ContractId Token
       with
         newOwner : Party
       controller owner
       do
         create this with owner = newOwner
-```
+```
\ No newline at end of file