diff --git a/packages/aws-durable-execution-sdk-js-examples/scripts/generate-sam-template.js b/packages/aws-durable-execution-sdk-js-examples/scripts/generate-sam-template.js
index 8b6b8164..10b0e565 100644
--- a/packages/aws-durable-execution-sdk-js-examples/scripts/generate-sam-template.js
+++ b/packages/aws-durable-execution-sdk-js-examples/scripts/generate-sam-template.js
@@ -17,11 +17,6 @@ const EXAMPLE_CONFIGS = {
       },
     ],
   },
-  "wait-for-callback-submitter-retry-success": {
-    memorySize: 128,
-    timeout: 120,
-    policies: [],
-  },
 };
 
 // Default configuration for Lambda functions
@@ -45,13 +40,18 @@ function toPascalCase(filename) {
  * Get TypeScript files from src/examples directory
  */
 function getExampleFiles() {
-  const examplesDir = path.join(__dirname, "../src/examples");
+  const catalogPath = path.join(
+    __dirname,
+    "../src/utils/examples-catalog.json",
+  );
 
-  if (!fs.existsSync(examplesDir)) {
-    throw new Error(`Examples directory not found: ${examplesDir}`);
+  if (!fs.existsSync(catalogPath)) {
+    throw new Error(`Examples directory not found: ${catalogPath}`);
   }
 
-  const exampleFiles = [];
+  const catalog = JSON.parse(fs.readFileSync(catalogPath, "utf8"));
+
+  const exampleFiles = catalog.map((example) => example.name);
 
   // Read all directories in examples
   const entries = fs.readdirSync(examplesDir, { withFileTypes: true });
@@ -105,25 +105,25 @@ function getExampleFiles() {
 /**
  * Create a Lambda function resource configuration
  */
-function createFunctionResource(filename, skipVerboseLogging = false) {
-  const resourceName = toPascalCase(filename);
-  const config = EXAMPLE_CONFIGS[filename] || DEFAULT_CONFIG;
+function createFunctionResource(
+  resourceName,
+  catalog,
+  skipVerboseLogging = false,
+) {
+  const config = EXAMPLE_CONFIGS[resourceName] || DEFAULT_CONFIG;
 
   const functionResource = {
     Type: "AWS::Serverless::Function",
     Properties: {
-      FunctionName: `${resourceName}-TypeScript`,
+      FunctionName: resourceName,
       CodeUri: "./dist",
-      Handler: `${filename}.handler`,
+      Handler: catalog.handler,
       Runtime: "nodejs22.x",
       Architectures: ["x86_64"],
       MemorySize: config.memorySize,
       Timeout: config.timeout,
       Role: { "Fn::GetAtt": ["DurableFunctionRole", "Arn"] },
-      DurableConfig: {
-        ExecutionTimeout: 3600,
-        RetentionPeriodInDays: 7,
-      },
+      DurableConfig: catalog.durableConfig,
       Environment: {
         Variables: {
           AWS_ENDPOINT_URL_LAMBDA: "http://host.docker.internal:5000",
@@ -149,9 +149,20 @@ function createFunctionResource(filename, skipVerboseLogging = false) {
  * Generate the complete CloudFormation template
  */
 function generateTemplate(skipVerboseLogging = false) {
-  const exampleFiles = getExampleFiles();
+  const examplesCatalogPath = path.join(
+    __dirname,
+    "../src/utils/examples-catalog.json",
+  );
 
-  if (exampleFiles.length === 0) {
+  if (!fs.existsSync(examplesCatalogPath)) {
+    throw new Error(`Examples directory not found: ${examplesCatalogPath}`);
+  }
+
+  const examplesCatalog = JSON.parse(
+    fs.readFileSync(examplesCatalogPath, "utf8"),
+  );
+
+  if (examplesCatalog.length === 0) {
     throw new Error("No TypeScript example files found in src/examples");
   }
 
@@ -202,12 +213,11 @@ function generateTemplate(skipVerboseLogging = false) {
   };
 
   // Generate resources for each example file
-  exampleFiles.forEach((filename) => {
-    const resourceName = toPascalCase(filename);
-    template.Resources[resourceName] = createFunctionResource(
-      filename,
-      skipVerboseLogging,
-    );
+  examplesCatalog.forEach((catalog) => {
+    const resourceName = catalog.name.replace(/\s/g, "") + `-22x-NodeJS-Local`;
+    template.Resources[
+      toPascalCase(catalog.handler.slice(0, -".handler".length))
+    ] = createFunctionResource(resourceName, catalog, skipVerboseLogging);
   });
 
   return template;
diff --git a/packages/aws-durable-execution-sdk-js-examples/src/__tests__/generate-sam-template.test.ts b/packages/aws-durable-execution-sdk-js-examples/src/__tests__/generate-sam-template.test.ts
index b4e06ed2..5ec772dc 100644
--- a/packages/aws-durable-execution-sdk-js-examples/src/__tests__/generate-sam-template.test.ts
+++ b/packages/aws-durable-execution-sdk-js-examples/src/__tests__/generate-sam-template.test.ts
@@ -17,10 +17,19 @@ describe("generate-sam-template", () => {
 
   describe("createFunctionResource", () => {
     test("creates default function resource", () => {
-      const resource = createFunctionResource("hello-world");
+      const resource = createFunctionResource("hello-world", {
+        name: "Hello World",
+        description: "A simple hello world example with no durable operations",
+        path: "aws-durable-execution-sdk-js/packages/aws-durable-execution-sdk-js-examples/src/examples/hello-world/hello-world.ts",
+        handler: "hello-world.handler",
+        durableConfig: {
+          ExecutionTimeout: 60,
+          RetentionPeriodInDays: 7,
+        },
+      });
 
       expect(resource.Type).toBe("AWS::Serverless::Function");
-      expect(resource.Properties.FunctionName).toBe("HelloWorld-TypeScript");
+      expect(resource.Properties.FunctionName).toBe("hello-world");
       expect(resource.Properties.Handler).toBe("hello-world.handler");
       expect(resource.Properties.Runtime).toBe("nodejs22.x");
       expect(resource.Properties.MemorySize).toBe(128);
@@ -29,11 +38,18 @@ describe("generate-sam-template", () => {
     });
 
     test("creates function resource with custom config for steps-with-retry", () => {
-      const resource = createFunctionResource("steps-with-retry");
+      const resource = createFunctionResource("steps-with-retry", {
+        name: "Steps With Retry",
+        description: "An example demonstrating retry functionality with steps",
+        path: "aws-durable-execution-sdk-js/packages/aws-durable-execution-sdk-js-examples/src/examples/step/steps-with-retry/steps-with-retry.ts",
+        handler: "steps-with-retry.handler",
+        durableConfig: {
+          ExecutionTimeout: 60,
+          RetentionPeriodInDays: 7,
+        },
+      });
 
-      expect(resource.Properties.FunctionName).toBe(
-        "StepsWithRetry-TypeScript",
-      );
+      expect(resource.Properties.FunctionName).toBe("steps-with-retry");
       expect(resource.Properties.MemorySize).toBe(256);
       expect(resource.Properties.Timeout).toBe(300);
       expect(resource.Properties.Policies).toEqual([
@@ -46,7 +62,7 @@ describe("generate-sam-template", () => {
     });
 
     test("includes required environment variables", () => {
-      const resource = createFunctionResource("hello-world");
+      const resource = createFunctionResource("hello-world", {});
 
       expect(resource.Properties.Environment.Variables).toEqual({
         AWS_ENDPOINT_URL_LAMBDA: "http://host.docker.internal:5000",
diff --git a/packages/aws-durable-execution-sdk-js-examples/template.yml b/packages/aws-durable-execution-sdk-js-examples/template.yml
index 3e88cb12..6e16a39f 100644
--- a/packages/aws-durable-execution-sdk-js-examples/template.yml
+++ b/packages/aws-durable-execution-sdk-js-examples/template.yml
@@ -28,7 +28,7 @@ Resources:
   BlockExample:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: BlockExample-TypeScript
+      FunctionName: BlockExample-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: block-example.handler
       Runtime: nodejs22.x
@@ -41,7 +41,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -53,7 +53,7 @@ Resources:
   ComprehensiveOperations:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ComprehensiveOperations-TypeScript
+      FunctionName: ComprehensiveOperations-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: comprehensive-operations.handler
       Runtime: nodejs22.x
@@ -66,7 +66,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -78,7 +78,7 @@ Resources:
   ConcurrentOperations:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ConcurrentOperations-TypeScript
+      FunctionName: ConcurrentOperations-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: concurrent-operations.handler
       Runtime: nodejs22.x
@@ -91,7 +91,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -103,7 +103,7 @@ Resources:
   ConcurrentWait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ConcurrentWait-TypeScript
+      FunctionName: ConcurrentWait-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: concurrent-wait.handler
       Runtime: nodejs22.x
@@ -116,7 +116,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -125,12 +125,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallback:
+  ParentContextInChild:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallback-TypeScript
+      FunctionName: ParentContextinChildError-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback.handler
+      Handler: parent-context-in-child.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -141,7 +141,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -150,12 +150,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackConcurrent:
+  ParentContextInStep:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackConcurrent-TypeScript
+      FunctionName: ParentContextinStepError-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-concurrent.handler
+      Handler: parent-context-in-step.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -166,7 +166,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -175,12 +175,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackFailures:
+  ParentContextInWaitCondition:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackFailures-TypeScript
+      FunctionName: ParentContextinWaitForConditionError-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-failures.handler
+      Handler: parent-context-in-wait-condition.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -191,7 +191,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -200,12 +200,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackHeartbeat:
+  CreateCallbackConcurrent:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackHeartbeat-TypeScript
+      FunctionName: CreateCallback-Concurrent-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-heartbeat.handler
+      Handler: create-callback-concurrent.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -216,7 +216,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -225,12 +225,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackMixedOps:
+  CreateCallbackFailures:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackMixedOps-TypeScript
+      FunctionName: CreateCallback-Failures-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-mixed-ops.handler
+      Handler: create-callback-failures.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -241,7 +241,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -250,12 +250,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackSerdes:
+  CreateCallbackHeartbeat:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackSerdes-TypeScript
+      FunctionName: CreateCallback-Heartbeat-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-serdes.handler
+      Handler: create-callback-heartbeat.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -266,7 +266,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -275,12 +275,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  CreateCallbackTimeout:
+  CreateCallbackMixedOps:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: CreateCallbackTimeout-TypeScript
+      FunctionName: CreateCallback-MixedOperations-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: create-callback-timeout.handler
+      Handler: create-callback-mixed-ops.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -291,7 +291,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -300,12 +300,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ErrorDeterminism:
+  CreateCallbackSerdes:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ErrorDeterminism-TypeScript
+      FunctionName: CreateCallback-CustomSerdes-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: error-determinism.handler
+      Handler: create-callback-serdes.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -316,7 +316,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -325,12 +325,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ForceCheckpointing:
+  CreateCallback:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ForceCheckpointing-TypeScript
+      FunctionName: CreateCallback-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: force-checkpointing.handler
+      Handler: create-callback.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -341,7 +341,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -350,12 +350,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ForceCheckpointingCallback:
+  CreateCallbackTimeout:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ForceCheckpointingCallback-TypeScript
+      FunctionName: CreateCallback-Timeout-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: force-checkpointing-callback.handler
+      Handler: create-callback-timeout.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -366,7 +366,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -375,12 +375,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ForceCheckpointingInvoke:
+  ErrorDeterminism:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ForceCheckpointingInvoke-TypeScript
+      FunctionName: ErrorDeterminism-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: force-checkpointing-invoke.handler
+      Handler: error-determinism.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -391,7 +391,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -400,12 +400,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ForceCheckpointingMultipleWait:
+  ForceCheckpointingCallback:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ForceCheckpointingMultipleWait-TypeScript
+      FunctionName: ForceCheckpointing-Callback-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: force-checkpointing-multiple-wait.handler
+      Handler: force-checkpointing-callback.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -416,7 +416,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -425,12 +425,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  HandlerError:
+  ForceCheckpointingInvoke:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: HandlerError-TypeScript
+      FunctionName: ForceCheckpointing-Invoke-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: handler-error.handler
+      Handler: force-checkpointing-invoke.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -441,7 +441,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -450,12 +450,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  HelloWorld:
+  ForceCheckpointingMultipleWait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: HelloWorld-TypeScript
+      FunctionName: ForceCheckpointing-MultipleWait-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: hello-world.handler
+      Handler: force-checkpointing-multiple-wait.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -466,7 +466,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -475,12 +475,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  InvokeSimple:
+  ForceCheckpointing:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: InvokeSimple-TypeScript
+      FunctionName: ForceCheckpointing-StepRetry-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: invoke-simple.handler
+      Handler: force-checkpointing.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -491,7 +491,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -500,12 +500,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  LoggerAfterCallback:
+  HandlerError:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: LoggerAfterCallback-TypeScript
+      FunctionName: HandlerError-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: logger-after-callback.handler
+      Handler: handler-error.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -516,7 +516,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -525,12 +525,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  LoggerAfterWait:
+  HelloWorld:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: LoggerAfterWait-TypeScript
+      FunctionName: HelloWorld-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: logger-after-wait.handler
+      Handler: hello-world.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -541,7 +541,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -550,12 +550,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  LoggerLogLevels:
+  InvokeSimple:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: LoggerLogLevels-TypeScript
+      FunctionName: InvokeSimple-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: logger-log-levels.handler
+      Handler: invoke-simple.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -566,7 +566,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -575,12 +575,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  MapBasic:
+  LoggerAfterCallback:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: MapBasic-TypeScript
+      FunctionName: LoggerAfterCallback-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: map-basic.handler
+      Handler: logger-after-callback.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -591,7 +591,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -600,12 +600,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  MapCompletionConfigIssue:
+  LoggerAfterWait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: MapCompletionConfigIssue-TypeScript
+      FunctionName: LoggerAfterWait-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: map-completion-config-issue.handler
+      Handler: logger-after-wait.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -616,7 +616,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -625,12 +625,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  MapLargeScale:
+  LoggerLogLevels:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: MapLargeScale-TypeScript
+      FunctionName: LoggerLogLevels-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: map-large-scale.handler
+      Handler: logger-log-levels.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -641,7 +641,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -650,12 +650,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  MultipleWaits:
+  PowertoolsLogger:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: MultipleWaits-TypeScript
+      FunctionName: PowertoolsLogger-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: multiple-waits.handler
+      Handler: powertools-logger.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -666,7 +666,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -675,12 +675,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  NoReplayExecution:
+  SimplePowertoolsLogger:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: NoReplayExecution-TypeScript
+      FunctionName: SimplePowertoolsLogger-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: no-replay-execution.handler
+      Handler: simple-powertools-logger.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -691,7 +691,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -700,12 +700,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  NonDurable:
+  MapBasic:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: NonDurable-TypeScript
+      FunctionName: BasicMap-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: non-durable.handler
+      Handler: map-basic.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -716,7 +716,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -725,12 +725,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParallelBasic:
+  MapLargeScale:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParallelBasic-TypeScript
+      FunctionName: LargeScaleMap-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parallel-basic.handler
+      Handler: map-large-scale.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -741,7 +741,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -750,12 +750,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParallelHeterogeneous:
+  MapCompletionConfigIssue:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParallelHeterogeneous-TypeScript
+      FunctionName: MapCompletionConfigIssue-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parallel-heterogeneous.handler
+      Handler: map-completion-config-issue.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -766,7 +766,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -775,12 +775,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParallelMinSuccessfulCallback:
+  MultipleWaits:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParallelMinSuccessfulCallback-TypeScript
+      FunctionName: MultipleWaits-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parallel-min-successful-callback.handler
+      Handler: multiple-waits.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -791,7 +791,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -800,12 +800,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParallelWait:
+  NoReplayExecution:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParallelWait-TypeScript
+      FunctionName: NoReplayExecution-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parallel-wait.handler
+      Handler: no-replay-execution.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -816,7 +816,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -825,12 +825,35 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParentContextInChild:
+  NonDurable:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParentContextInChild-TypeScript
+      FunctionName: Non-Durable-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parent-context-in-child.handler
+      Handler: non-durable.handler
+      Runtime: nodejs22.x
+      Architectures:
+        - x86_64
+      MemorySize: 128
+      Timeout: 60
+      Role:
+        Fn::GetAtt:
+          - DurableFunctionRole
+          - Arn
+      DurableConfig: null
+      Environment:
+        Variables:
+          AWS_ENDPOINT_URL_LAMBDA: http://host.docker.internal:5000
+          DURABLE_VERBOSE_MODE: "false"
+          DURABLE_EXAMPLES_VERBOSE: "true"
+    Metadata:
+      SkipBuild: "True"
+  ParallelBasic:
+    Type: AWS::Serverless::Function
+    Properties:
+      FunctionName: BasicParallel-22x-NodeJS-Local
+      CodeUri: ./dist
+      Handler: parallel-basic.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -841,7 +864,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -850,12 +873,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParentContextInStep:
+  ParallelHeterogeneous:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParentContextInStep-TypeScript
+      FunctionName: ParallelHeterogeneous-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parent-context-in-step.handler
+      Handler: parallel-heterogeneous.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -866,7 +889,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -875,12 +898,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  ParentContextInWaitCondition:
+  ParallelMinSuccessfulCallback:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: ParentContextInWaitCondition-TypeScript
+      FunctionName: ParallelminSuccessfulwithCallbacks-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: parent-context-in-wait-condition.handler
+      Handler: parallel-min-successful-callback.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -891,7 +914,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -900,12 +923,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  PowertoolsLogger:
+  ParallelWait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PowertoolsLogger-TypeScript
+      FunctionName: Parallelwait-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: powertools-logger.handler
+      Handler: parallel-wait.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -916,7 +939,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -928,7 +951,7 @@ Resources:
   PromiseAll:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseAll-TypeScript
+      FunctionName: PromiseAll-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-all.handler
       Runtime: nodejs22.x
@@ -941,7 +964,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -953,7 +976,7 @@ Resources:
   PromiseAllSettled:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseAllSettled-TypeScript
+      FunctionName: PromiseAllSettled-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-all-settled.handler
       Runtime: nodejs22.x
@@ -966,7 +989,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -978,7 +1001,7 @@ Resources:
   PromiseAllWait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseAllWait-TypeScript
+      FunctionName: PromiseAllWithWait-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-all-wait.handler
       Runtime: nodejs22.x
@@ -991,7 +1014,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1003,7 +1026,7 @@ Resources:
   PromiseAny:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseAny-TypeScript
+      FunctionName: PromiseAny-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-any.handler
       Runtime: nodejs22.x
@@ -1016,7 +1039,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1028,7 +1051,7 @@ Resources:
   PromiseCombinators:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseCombinators-TypeScript
+      FunctionName: PromiseCombinators-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-combinators.handler
       Runtime: nodejs22.x
@@ -1041,7 +1064,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1053,7 +1076,7 @@ Resources:
   PromiseRace:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseRace-TypeScript
+      FunctionName: PromiseRace-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-race.handler
       Runtime: nodejs22.x
@@ -1066,7 +1089,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1078,7 +1101,7 @@ Resources:
   PromiseReplay:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseReplay-TypeScript
+      FunctionName: PromiseReplay-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-replay.handler
       Runtime: nodejs22.x
@@ -1091,7 +1114,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1103,7 +1126,7 @@ Resources:
   PromiseUnhandledRejection:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: PromiseUnhandledRejection-TypeScript
+      FunctionName: PromiseUnhandledRejection-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: promise-unhandled-rejection.handler
       Runtime: nodejs22.x
@@ -1116,7 +1139,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1128,7 +1151,7 @@ Resources:
   RetryExhaustion:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: RetryExhaustion-TypeScript
+      FunctionName: RetryExhaustion-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: retry-exhaustion.handler
       Runtime: nodejs22.x
@@ -1141,7 +1164,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1153,7 +1176,7 @@ Resources:
   RunInChildContext:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: RunInChildContext-TypeScript
+      FunctionName: RuninChildContext-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: run-in-child-context.handler
       Runtime: nodejs22.x
@@ -1166,7 +1189,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1178,7 +1201,7 @@ Resources:
   RunInChildContextCheckpointSizeLimit:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: RunInChildContextCheckpointSizeLimit-TypeScript
+      FunctionName: RunInChildContextCheckpointSizeLimitBoundary-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: run-in-child-context-checkpoint-size-limit.handler
       Runtime: nodejs22.x
@@ -1191,7 +1214,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1200,12 +1223,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  RunInChildContextFailingStep:
+  RunInChildContextLargeData:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: RunInChildContextFailingStep-TypeScript
+      FunctionName: RunInChildContextLargeData-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: run-in-child-context-failing-step.handler
+      Handler: run-in-child-context-large-data.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1216,7 +1239,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1225,12 +1248,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  RunInChildContextLargeData:
+  RunInChildContextFailingStep:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: RunInChildContextLargeData-TypeScript
+      FunctionName: RuninChildContextwithFailingStep-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: run-in-child-context-large-data.handler
+      Handler: run-in-child-context-failing-step.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1241,7 +1264,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1253,7 +1276,7 @@ Resources:
   SimpleExecution:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: SimpleExecution-TypeScript
+      FunctionName: SimpleExecution-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: simple-execution.handler
       Runtime: nodejs22.x
@@ -1266,7 +1289,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1275,12 +1298,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  SimplePowertoolsLogger:
+  StepBasic:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: SimplePowertoolsLogger-TypeScript
+      FunctionName: BasicStep-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: simple-powertools-logger.handler
+      Handler: step-basic.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1291,7 +1314,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1300,12 +1323,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  StepBasic:
+  StepNamed:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: StepBasic-TypeScript
+      FunctionName: NamedStep-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: step-basic.handler
+      Handler: step-named.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1316,7 +1339,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1328,7 +1351,7 @@ Resources:
   StepErrorDeterminism:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: StepErrorDeterminism-TypeScript
+      FunctionName: StepErrorDeterminism-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: step-error-determinism.handler
       Runtime: nodejs22.x
@@ -1341,7 +1364,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1350,12 +1373,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  StepNamed:
+  StepsWithRetry:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: StepNamed-TypeScript
+      FunctionName: StepsWithRetry-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: step-named.handler
+      Handler: steps-with-retry.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1366,7 +1389,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1378,7 +1401,7 @@ Resources:
   StepWithRetry:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: StepWithRetry-TypeScript
+      FunctionName: StepwithRetry-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: step-with-retry.handler
       Runtime: nodejs22.x
@@ -1391,47 +1414,19 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
-        RetentionPeriodInDays: 7
-      Environment:
-        Variables:
-          AWS_ENDPOINT_URL_LAMBDA: http://host.docker.internal:5000
-          DURABLE_VERBOSE_MODE: "false"
-          DURABLE_EXAMPLES_VERBOSE: "true"
-    Metadata:
-      SkipBuild: "True"
-  StepsWithRetry:
-    Type: AWS::Serverless::Function
-    Properties:
-      FunctionName: StepsWithRetry-TypeScript
-      CodeUri: ./dist
-      Handler: steps-with-retry.handler
-      Runtime: nodejs22.x
-      Architectures:
-        - x86_64
-      MemorySize: 256
-      Timeout: 300
-      Role:
-        Fn::GetAtt:
-          - DurableFunctionRole
-          - Arn
-      DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
           AWS_ENDPOINT_URL_LAMBDA: http://host.docker.internal:5000
           DURABLE_VERBOSE_MODE: "false"
           DURABLE_EXAMPLES_VERBOSE: "true"
-      Policies:
-        - DynamoDBReadPolicy:
-            TableName: TEST
     Metadata:
       SkipBuild: "True"
   UndefinedResults:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: UndefinedResults-TypeScript
+      FunctionName: UndefinedResults-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: undefined-results.handler
       Runtime: nodejs22.x
@@ -1444,7 +1439,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1456,7 +1451,7 @@ Resources:
   Wait:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: Wait-TypeScript
+      FunctionName: WaitState-22x-NodeJS-Local
       CodeUri: ./dist
       Handler: wait.handler
       Runtime: nodejs22.x
@@ -1469,7 +1464,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1478,12 +1473,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallback:
+  WaitNamed:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallback-TypeScript
+      FunctionName: NamedWait-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback.handler
+      Handler: wait-named.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1494,7 +1489,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1503,12 +1498,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackAnonymous:
+  WaitUnawaited:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackAnonymous-TypeScript
+      FunctionName: UnawaitedWait-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-anonymous.handler
+      Handler: wait-unawaited.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1519,7 +1514,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1528,12 +1523,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackChildContext:
+  WaitForCallbackAnonymous:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackChildContext-TypeScript
+      FunctionName: WaitforCallback-AnonymousSubmitter-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-child-context.handler
+      Handler: wait-for-callback-anonymous.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1544,7 +1539,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1553,12 +1548,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackFailingSubmitter:
+  WaitForCallback:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackFailingSubmitter-TypeScript
+      FunctionName: WaitforCallback-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-failing-submitter.handler
+      Handler: wait-for-callback.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1569,7 +1564,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1578,12 +1573,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackFailures:
+  WaitForCallbackChildContext:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackFailures-TypeScript
+      FunctionName: WaitforCallback-ChildContext-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-failures.handler
+      Handler: wait-for-callback-child-context.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1594,7 +1589,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1603,12 +1598,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackHeartbeatSends:
+  WaitForCallbackFailingSubmitter:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackHeartbeatSends-TypeScript
+      FunctionName: WaitforCallback-FailingSubmitter-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-heartbeat-sends.handler
+      Handler: wait-for-callback-failing-submitter.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1619,7 +1614,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1628,12 +1623,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackMixedOps:
+  WaitForCallbackFailures:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackMixedOps-TypeScript
+      FunctionName: WaitforCallback-CallbackFailures-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-mixed-ops.handler
+      Handler: wait-for-callback-failures.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1644,7 +1639,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1653,12 +1648,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackMultipleInvocations:
+  WaitForCallbackHeartbeatSends:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackMultipleInvocations-TypeScript
+      FunctionName: WaitforCallback-HeartbeatSends-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-multiple-invocations.handler
+      Handler: wait-for-callback-heartbeat-sends.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1669,7 +1664,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1678,12 +1673,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackNested:
+  WaitForCallbackMixedOps:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackNested-TypeScript
+      FunctionName: WaitforCallback-MixedOperations-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-nested.handler
+      Handler: wait-for-callback-mixed-ops.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1694,7 +1689,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1703,12 +1698,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackSerdes:
+  WaitForCallbackMultipleInvocations:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackSerdes-TypeScript
+      FunctionName: WaitforCallbackMultipleInvocations-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-serdes.handler
+      Handler: wait-for-callback-multiple-invocations.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1719,7 +1714,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1728,12 +1723,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackSubmitterFailureCatchable:
+  WaitForCallbackNested:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackSubmitterFailureCatchable-TypeScript
+      FunctionName: WaitforCallback-NestedContexts-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-submitter-failure-catchable.handler
+      Handler: wait-for-callback-nested.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1744,7 +1739,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1753,23 +1748,23 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackSubmitterRetrySuccess:
+  WaitForCallbackSerdes:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackSubmitterRetrySuccess-TypeScript
+      FunctionName: WaitforCallback-CustomSerdes-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-submitter-retry-success.handler
+      Handler: wait-for-callback-serdes.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
       MemorySize: 128
-      Timeout: 120
+      Timeout: 60
       Role:
         Fn::GetAtt:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1778,12 +1773,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCallbackTimeout:
+  WaitForCallbackSubmitterFailureCatchable:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCallbackTimeout-TypeScript
+      FunctionName: WaitforCallback-SubmitterFailureCatchable-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-callback-timeout.handler
+      Handler: wait-for-callback-submitter-failure-catchable.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1794,7 +1789,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1803,12 +1798,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitForCondition:
+  WaitForCallbackSubmitterRetrySuccess:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitForCondition-TypeScript
+      FunctionName: WaitforCallback-SubmitterRetrySuccess-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-for-condition.handler
+      Handler: wait-for-callback-submitter-retry-success.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1819,7 +1814,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1828,12 +1823,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitNamed:
+  WaitForCallbackTimeout:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitNamed-TypeScript
+      FunctionName: WaitforCallback-Timeout-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-named.handler
+      Handler: wait-for-callback-timeout.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1844,7 +1839,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables:
@@ -1853,12 +1848,12 @@ Resources:
           DURABLE_EXAMPLES_VERBOSE: "true"
     Metadata:
       SkipBuild: "True"
-  WaitUnawaited:
+  WaitForCondition:
     Type: AWS::Serverless::Function
     Properties:
-      FunctionName: WaitUnawaited-TypeScript
+      FunctionName: WaitforCondition-22x-NodeJS-Local
       CodeUri: ./dist
-      Handler: wait-unawaited.handler
+      Handler: wait-for-condition.handler
       Runtime: nodejs22.x
       Architectures:
         - x86_64
@@ -1869,7 +1864,7 @@ Resources:
           - DurableFunctionRole
           - Arn
       DurableConfig:
-        ExecutionTimeout: 3600
+        ExecutionTimeout: 60
         RetentionPeriodInDays: 7
       Environment:
         Variables: