diff --git a/Casks/otf-cascadia-code-nf.rb b/Casks/otf-cascadia-code-nf.rb
new file mode 100644
index 0000000..c43e2af
--- /dev/null
+++ b/Casks/otf-cascadia-code-nf.rb
@@ -0,0 +1,28 @@
+cask "otf-cascadia-code-nf" do
+  version "2407.24"
+  sha256 "e67a68ee3386db63f48b9054bd196ea752bc6a4ebb4df35adce6733da50c8474"
+
+  url "https://github.com/microsoft/cascadia-code/releases/download/v#{version}/CascadiaCode-#{version}.zip"
+  name "Cascadia Code NF"
+  homepage "https://github.com/microsoft/cascadia-code"
+
+  livecheck do
+    url :url
+    strategy :github_latest
+  end
+
+  font "otf/static/CascadiaCodeNF-Bold.otf"
+  font "otf/static/CascadiaCodeNF-BoldItalic.otf"
+  font "otf/static/CascadiaCodeNF-ExtraLight.otf"
+  font "otf/static/CascadiaCodeNF-ExtraLightItalic.otf"
+  font "otf/static/CascadiaCodeNF-Italic.otf"
+  font "otf/static/CascadiaCodeNF-Light.otf"
+  font "otf/static/CascadiaCodeNF-LightItalic.otf"
+  font "otf/static/CascadiaCodeNF-Regular.otf"
+  font "otf/static/CascadiaCodeNF-SemiBold.otf"
+  font "otf/static/CascadiaCodeNF-SemiBoldItalic.otf"
+  font "otf/static/CascadiaCodeNF-SemiLight.otf"
+  font "otf/static/CascadiaCodeNF-SemiLightItalic.otf"
+
+  # No zap stanza required
+end
diff --git a/Casks/otf-cascadia-code-pl.rb b/Casks/otf-cascadia-code-pl.rb
new file mode 100644
index 0000000..2963e29
--- /dev/null
+++ b/Casks/otf-cascadia-code-pl.rb
@@ -0,0 +1,28 @@
+cask "otf-cascadia-code-pl" do
+  version "2407.24"
+  sha256 "e67a68ee3386db63f48b9054bd196ea752bc6a4ebb4df35adce6733da50c8474"
+
+  url "https://github.com/microsoft/cascadia-code/releases/download/v#{version}/CascadiaCode-#{version}.zip"
+  name "Cascadia Code PL"
+  homepage "https://github.com/microsoft/cascadia-code"
+
+  livecheck do
+    url :url
+    strategy :github_latest
+  end
+
+  font "otf/static/CascadiaCodePL-Bold.otf"
+  font "otf/static/CascadiaCodePL-BoldItalic.otf"
+  font "otf/static/CascadiaCodePL-ExtraLight.otf"
+  font "otf/static/CascadiaCodePL-ExtraLightItalic.otf"
+  font "otf/static/CascadiaCodePL-Italic.otf"
+  font "otf/static/CascadiaCodePL-Light.otf"
+  font "otf/static/CascadiaCodePL-LightItalic.otf"
+  font "otf/static/CascadiaCodePL-Regular.otf"
+  font "otf/static/CascadiaCodePL-SemiBold.otf"
+  font "otf/static/CascadiaCodePL-SemiBoldItalic.otf"
+  font "otf/static/CascadiaCodePL-SemiLight.otf"
+  font "otf/static/CascadiaCodePL-SemiLightItalic.otf"
+
+  # No zap stanza required
+end
diff --git a/Casks/otf-cascadia-code.rb b/Casks/otf-cascadia-code.rb
new file mode 100644
index 0000000..a27fced
--- /dev/null
+++ b/Casks/otf-cascadia-code.rb
@@ -0,0 +1,28 @@
+cask "otf-cascadia-code" do
+  version "2407.24"
+  sha256 "e67a68ee3386db63f48b9054bd196ea752bc6a4ebb4df35adce6733da50c8474"
+
+  url "https://github.com/microsoft/cascadia-code/releases/download/v#{version}/CascadiaCode-#{version}.zip"
+  name "Cascadia Code"
+  homepage "https://github.com/microsoft/cascadia-code"
+
+  livecheck do
+    url :url
+    strategy :github_latest
+  end
+
+  font "otf/static/CascadiaCode-Bold.otf"
+  font "otf/static/CascadiaCode-BoldItalic.otf"
+  font "otf/static/CascadiaCode-ExtraLight.otf"
+  font "otf/static/CascadiaCode-ExtraLightItalic.otf"
+  font "otf/static/CascadiaCode-Italic.otf"
+  font "otf/static/CascadiaCode-Light.otf"
+  font "otf/static/CascadiaCode-LightItalic.otf"
+  font "otf/static/CascadiaCode-Regular.otf"
+  font "otf/static/CascadiaCode-SemiBold.otf"
+  font "otf/static/CascadiaCode-SemiBoldItalic.otf"
+  font "otf/static/CascadiaCode-SemiLight.otf"
+  font "otf/static/CascadiaCode-SemiLightItalic.otf"
+
+  # No zap stanza required
+end
diff --git a/Casks/otf-cascadia-mono-nf.rb b/Casks/otf-cascadia-mono-nf.rb
new file mode 100644
index 0000000..b65caaf
--- /dev/null
+++ b/Casks/otf-cascadia-mono-nf.rb
@@ -0,0 +1,28 @@
+cask "otf-cascadia-mono-nf" do
+  version "2407.24"
+  sha256 "e67a68ee3386db63f48b9054bd196ea752bc6a4ebb4df35adce6733da50c8474"
+
+  url "https://github.com/microsoft/cascadia-code/releases/download/v#{version}/CascadiaCode-#{version}.zip"
+  name "Cascadia Mono NF"
+  homepage "https://github.com/microsoft/cascadia-code"
+
+  livecheck do
+    url :url
+    strategy :github_latest
+  end
+
+  font "otf/static/CascadiaMonoNF-Bold.otf"
+  font "otf/static/CascadiaMonoNF-BoldItalic.otf"
+  font "otf/static/CascadiaMonoNF-ExtraLight.otf"
+  font "otf/static/CascadiaMonoNF-ExtraLightItalic.otf"
+  font "otf/static/CascadiaMonoNF-Italic.otf"
+  font "otf/static/CascadiaMonoNF-Light.otf"
+  font "otf/static/CascadiaMonoNF-LightItalic.otf"
+  font "otf/static/CascadiaMonoNF-Regular.otf"
+  font "otf/static/CascadiaMonoNF-SemiBold.otf"
+  font "otf/static/CascadiaMonoNF-SemiBoldItalic.otf"
+  font "otf/static/CascadiaMonoNF-SemiLight.otf"
+  font "otf/static/CascadiaMonoNF-SemiLightItalic.otf"
+
+  # No zap stanza required
+end
diff --git a/Casks/otf-cascadia-mono-pl.rb b/Casks/otf-cascadia-mono-pl.rb
index 6ec4b0a..633ffd4 100644
--- a/Casks/otf-cascadia-mono-pl.rb
+++ b/Casks/otf-cascadia-mono-pl.rb
@@ -11,18 +11,6 @@ cask "otf-cascadia-mono-pl" do
     strategy :github_latest
   end
 
-  font "otf/static/CascadiaCodePL-Bold.otf"
-  font "otf/static/CascadiaCodePL-BoldItalic.otf"
-  font "otf/static/CascadiaCodePL-ExtraLight.otf"
-  font "otf/static/CascadiaCodePL-ExtraLightItalic.otf"
-  font "otf/static/CascadiaCodePL-Italic.otf"
-  font "otf/static/CascadiaCodePL-Light.otf"
-  font "otf/static/CascadiaCodePL-LightItalic.otf"
-  font "otf/static/CascadiaCodePL-Regular.otf"
-  font "otf/static/CascadiaCodePL-SemiBold.otf"
-  font "otf/static/CascadiaCodePL-SemiBoldItalic.otf"
-  font "otf/static/CascadiaCodePL-SemiLight.otf"
-  font "otf/static/CascadiaCodePL-SemiLightItalic.otf"
   font "otf/static/CascadiaMonoPL-Bold.otf"
   font "otf/static/CascadiaMonoPL-BoldItalic.otf"
   font "otf/static/CascadiaMonoPL-ExtraLight.otf"
diff --git a/Casks/otf-cascadia-mono.rb b/Casks/otf-cascadia-mono.rb
new file mode 100644
index 0000000..c2fea98
--- /dev/null
+++ b/Casks/otf-cascadia-mono.rb
@@ -0,0 +1,28 @@
+cask "otf-cascadia-mono" do
+  version "2407.24"
+  sha256 "e67a68ee3386db63f48b9054bd196ea752bc6a4ebb4df35adce6733da50c8474"
+
+  url "https://github.com/microsoft/cascadia-code/releases/download/v#{version}/CascadiaCode-#{version}.zip"
+  name "Cascadia Mono"
+  homepage "https://github.com/microsoft/cascadia-code"
+
+  livecheck do
+    url :url
+    strategy :github_latest
+  end
+
+  font "otf/static/CascadiaMono-Bold.otf"
+  font "otf/static/CascadiaMono-BoldItalic.otf"
+  font "otf/static/CascadiaMono-ExtraLight.otf"
+  font "otf/static/CascadiaMono-ExtraLightItalic.otf"
+  font "otf/static/CascadiaMono-Italic.otf"
+  font "otf/static/CascadiaMono-Light.otf"
+  font "otf/static/CascadiaMono-LightItalic.otf"
+  font "otf/static/CascadiaMono-Regular.otf"
+  font "otf/static/CascadiaMono-SemiBold.otf"
+  font "otf/static/CascadiaMono-SemiBoldItalic.otf"
+  font "otf/static/CascadiaMono-SemiLight.otf"
+  font "otf/static/CascadiaMono-SemiLightItalic.otf"
+
+  # No zap stanza required
+end
diff --git a/gen.sh b/gen.sh
index 87e744c..76398d2 100755
--- a/gen.sh
+++ b/gen.sh
@@ -13,6 +13,9 @@ NAMES=(
 )
 
 for name in $NAMES[@]; do
-  export NAME=$name FNAME=${name// /}
-  envsubst < template.rb > Casks/${${name:l}// /-}.rb
+  NAME=$name
+  FNAME=${name// /}
+  PKGNAME="otf-${${name:l}// /-}"
+  export NAME FNAME PKGNAME
+  envsubst < template.rb > Casks/$PKGNAME.rb
 done
diff --git a/template.rb b/template.rb
index 08ae342..f73c1c1 100644
--- a/template.rb
+++ b/template.rb
@@ -1,4 +1,4 @@
-cask "otf-cascadia-mono-pl" do
+cask "$PKGNAME" do
   version "$VERSION"
   sha256 "$CHECKSUM"