diff --git a/packages/@aws-cdk/core/README.md b/packages/@aws-cdk/core/README.md
index a6d4d2efc5a9b..1090d893c508d 100644
--- a/packages/@aws-cdk/core/README.md
+++ b/packages/@aws-cdk/core/README.md
@@ -753,16 +753,19 @@ CloudFormation [mappings][cfn-mappings] are created and queried using the
 ```ts
 const regionTable = new CfnMapping(this, 'RegionTable', {
   mapping: {
-    regionName: {
-      'us-east-1': 'US East (N. Virginia)',
-      'us-east-2': 'US East (Ohio)',
+    'us-east-1': {
+      regionName: 'US East (N. Virginia)',
+      // ...
+    },
+    'us-east-2': {
+      regionName: 'US East (Ohio)',
       // ...
     },
     // ...
   }
 });
 
-regionTable.findInMap('regionName', Aws.REGION);
+regionTable.findInMap(Aws.REGION, 'regionName')
 ```
 
 This will yield the following template:
@@ -770,9 +773,10 @@ This will yield the following template:
 ```yaml
 Mappings:
   RegionTable:
-    regionName:
-      us-east-1: US East (N. Virginia)
-      us-east-2: US East (Ohio)
+    us-east-1:
+      regionName: US East (N. Virginia)
+    us-east-2:
+      regionName: US East (Ohio)
 ```
 
 Mappings can also be synthesized "lazily"; lazy mappings will only render a "Mappings"
@@ -787,24 +791,25 @@ call to `findInMap` will be able to resolve the value during synthesis and simpl
 ```ts
 const regionTable = new CfnMapping(this, 'RegionTable', {
   mapping: {
-    regionName: {
-      'us-east-1': 'US East (N. Virginia)',
-      'us-east-2': 'US East (Ohio)',
+    'us-east-1': {
+      regionName: 'US East (N. Virginia)',
+    },
+    'us-east-2': {
+      regionName: 'US East (Ohio)',
     },
   },
   lazy: true,
 });
 
-regionTable.findInMap('regionName', 'us-east-2');
+regionTable.findInMap('us-east-2', 'regionName');
 ```
 
 On the other hand, the following code will produce the "Mappings" section shown above,
-since the second-level key is an unresolved token. The call to `findInMap` will return a
-token that resolves to `{ Fn::FindInMap: [ 'RegionTable', 'regionName', { Ref: AWS::Region
-} ] }`.
+since the top-level key is an unresolved token. The call to `findInMap` will return a token that resolves to 
+`{ "Fn::FindInMap": [ "RegionTable", { "Ref": "AWS::Region" }, "regionName" ] }`.
 
 ```ts
-regionTable.findInMap('regionName', Aws.REGION);
+regionTable.findInMap(Aws.REGION, 'regionName');
 ```
 
 [cfn-mappings]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/mappings-section-structure.html
diff --git a/packages/aws-cdk-lib/README.md b/packages/aws-cdk-lib/README.md
index 48d4cd65f93a5..5d225ce542aa5 100644
--- a/packages/aws-cdk-lib/README.md
+++ b/packages/aws-cdk-lib/README.md
@@ -786,16 +786,19 @@ CloudFormation [mappings][cfn-mappings] are created and queried using the
 ```ts
 const regionTable = new CfnMapping(this, 'RegionTable', {
   mapping: {
-    regionName: {
-      'us-east-1': 'US East (N. Virginia)',
-      'us-east-2': 'US East (Ohio)',
+    'us-east-1': {
+      regionName: 'US East (N. Virginia)',
+      // ...
+    },
+    'us-east-2': {
+      regionName: 'US East (Ohio)',
       // ...
     },
     // ...
   }
 });
 
-regionTable.findInMap('regionName', Aws.REGION);
+regionTable.findInMap(Aws.REGION, 'regionName')
 ```
 
 This will yield the following template:
@@ -803,9 +806,10 @@ This will yield the following template:
 ```yaml
 Mappings:
   RegionTable:
-    regionName:
-      us-east-1: US East (N. Virginia)
-      us-east-2: US East (Ohio)
+    us-east-1:
+      regionName: US East (N. Virginia)
+    us-east-2:
+      regionName: US East (Ohio)
 ```
 
 Mappings can also be synthesized "lazily"; lazy mappings will only render a "Mappings"
@@ -820,24 +824,25 @@ call to `findInMap` will be able to resolve the value during synthesis and simpl
 ```ts
 const regionTable = new CfnMapping(this, 'RegionTable', {
   mapping: {
-    regionName: {
-      'us-east-1': 'US East (N. Virginia)',
-      'us-east-2': 'US East (Ohio)',
+    'us-east-1': {
+      regionName: 'US East (N. Virginia)',
+    },
+    'us-east-2': {
+      regionName: 'US East (Ohio)',
     },
   },
   lazy: true,
 });
 
-regionTable.findInMap('regionName', 'us-east-2');
+regionTable.findInMap('us-east-2', 'regionName');
 ```
 
 On the other hand, the following code will produce the "Mappings" section shown above,
-since the second-level key is an unresolved token. The call to `findInMap` will return a
-token that resolves to `{ Fn::FindInMap: [ 'RegionTable', 'regionName', { Ref: AWS::Region
-} ] }`.
+since the top-level key is an unresolved token. The call to `findInMap` will return a token that resolves to 
+`{ "Fn::FindInMap": [ "RegionTable", { "Ref": "AWS::Region" }, "regionName" ] }`.
 
 ```ts
-regionTable.findInMap('regionName', Aws.REGION);
+regionTable.findInMap(Aws.REGION, 'regionName');
 ```
 
 [cfn-mappings]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/mappings-section-structure.html