diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
index 80f37250361bd..1f60234828fc8 100644
--- a/packages/aws-cdk-lib/package.json
+++ b/packages/aws-cdk-lib/package.json
@@ -13,7 +13,7 @@
   "stability": "experimental",
   "maturity": "developer-preview",
   "scripts": {
-    "gen": "ubergen && cfn-include-mapping-rewriter lib/cloudformation-include aws-cdk-lib",
+    "gen": "ubergen && cfninclude-rewriter lib/cloudformation-include aws-cdk-lib",
     "build": "cdk-build",
     "lint": "cdk-lint",
     "test": "cdk-test",
@@ -272,7 +272,7 @@
     "@types/fs-extra": "^8.1.1",
     "@types/node": "^10.17.47",
     "cdk-build-tools": "0.0.0",
-    "cfn-include-mapping-rewriter": "0.0.0",
+    "cfninclude-rewriter": "0.0.0",
     "constructs": "^3.2.0",
     "fs-extra": "^9.0.1",
     "pkglint": "0.0.0",
diff --git a/packages/monocdk/package.json b/packages/monocdk/package.json
index e3168ade0f489..2080424311378 100644
--- a/packages/monocdk/package.json
+++ b/packages/monocdk/package.json
@@ -12,7 +12,7 @@
   "stability": "experimental",
   "maturity": "developer-preview",
   "scripts": {
-    "gen": "ubergen && cfn-include-mapping-rewriter lib/cloudformation-include monocdk",
+    "gen": "ubergen && cfninclude-rewriter lib/cloudformation-include monocdk",
     "build": "cdk-build",
     "lint": "cdk-lint",
     "test": "cdk-test",
@@ -271,7 +271,7 @@
     "@types/fs-extra": "^8.1.1",
     "@types/node": "^10.17.47",
     "cdk-build-tools": "0.0.0",
-    "cfn-include-mapping-rewriter": "0.0.0",
+    "cfninclude-rewriter": "0.0.0",
     "constructs": "^3.2.0",
     "fs-extra": "^9.0.1",
     "pkglint": "0.0.0",
diff --git a/tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter b/tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter
deleted file mode 100755
index 24c0c1be13927..0000000000000
--- a/tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('./cfn-include-mapping-rewriter.js');
diff --git a/tools/cfn-include-mapping-rewriter/.eslintrc.js b/tools/cfninclude-rewriter/.eslintrc.js
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/.eslintrc.js
rename to tools/cfninclude-rewriter/.eslintrc.js
diff --git a/tools/cfn-include-mapping-rewriter/.gitignore b/tools/cfninclude-rewriter/.gitignore
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/.gitignore
rename to tools/cfninclude-rewriter/.gitignore
diff --git a/tools/cfn-include-mapping-rewriter/.npmignore b/tools/cfninclude-rewriter/.npmignore
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/.npmignore
rename to tools/cfninclude-rewriter/.npmignore
diff --git a/tools/cfn-include-mapping-rewriter/LICENSE b/tools/cfninclude-rewriter/LICENSE
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/LICENSE
rename to tools/cfninclude-rewriter/LICENSE
diff --git a/tools/cfn-include-mapping-rewriter/NOTICE b/tools/cfninclude-rewriter/NOTICE
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/NOTICE
rename to tools/cfninclude-rewriter/NOTICE
diff --git a/tools/cfn-include-mapping-rewriter/README.md b/tools/cfninclude-rewriter/README.md
similarity index 91%
rename from tools/cfn-include-mapping-rewriter/README.md
rename to tools/cfninclude-rewriter/README.md
index 0205437f314df..121786fe9ad04 100644
--- a/tools/cfn-include-mapping-rewriter/README.md
+++ b/tools/cfninclude-rewriter/README.md
@@ -1,4 +1,4 @@
-# cfn-include-mapping-rewriter
+# cfninclude-rewriter
 
 This tool modifies the `cfn-types-2-classes.json`
 file that is generated by the build of the `@aws-cdk/cloudformation-include` package
diff --git a/tools/cfninclude-rewriter/bin/cfninclude-rewriter b/tools/cfninclude-rewriter/bin/cfninclude-rewriter
new file mode 100755
index 0000000000000..8a7a7bdb9afab
--- /dev/null
+++ b/tools/cfninclude-rewriter/bin/cfninclude-rewriter
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('./cfninclude-rewriter.js');
diff --git a/tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter.ts b/tools/cfninclude-rewriter/bin/cfninclude-rewriter.ts
similarity index 88%
rename from tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter.ts
rename to tools/cfninclude-rewriter/bin/cfninclude-rewriter.ts
index dcb16a3ecfc6e..61222b469d010 100644
--- a/tools/cfn-include-mapping-rewriter/bin/cfn-include-mapping-rewriter.ts
+++ b/tools/cfninclude-rewriter/bin/cfninclude-rewriter.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 if (process.argv.length != 4) {
-  process.stderr.write('Usage: cfn-include-mapping-rewriter <cfn-include directory> <monolithic package name>');
+  process.stderr.write('Usage: cfninclude-rewriter <cfn-include directory> <monolithic package name>');
   process.exit(1);
 }
 
diff --git a/tools/cfn-include-mapping-rewriter/package.json b/tools/cfninclude-rewriter/package.json
similarity index 85%
rename from tools/cfn-include-mapping-rewriter/package.json
rename to tools/cfninclude-rewriter/package.json
index 02cead73cae87..561e6f1e159ed 100644
--- a/tools/cfn-include-mapping-rewriter/package.json
+++ b/tools/cfninclude-rewriter/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "cfn-include-mapping-rewriter",
+  "name": "cfninclude-rewriter",
   "private": true,
   "version": "0.0.0",
   "description": "Rewrites the 'CFN resource type to fully-qualified class name' mapping file from cfn-include for use in monolithic packages",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws/aws-cdk.git",
-    "directory": "tools/cfn-include-mapping-rewriter"
+    "directory": "tools/cfninclude-rewriter"
   },
   "bin": {
-    "cfn-include-mapping-rewriter": "bin/cfn-include-mapping-rewriter"
+    "cfninclude-rewriter": "bin/cfninclude-rewriter"
   },
   "scripts": {
     "build": "cdk-build",
diff --git a/tools/cfn-include-mapping-rewriter/tsconfig.json b/tools/cfninclude-rewriter/tsconfig.json
similarity index 100%
rename from tools/cfn-include-mapping-rewriter/tsconfig.json
rename to tools/cfninclude-rewriter/tsconfig.json