diff --git a/edgedbpkg/edgedb/__init__.py b/edgedbpkg/edgedb/__init__.py
index fe291f21..2ad92c96 100644
--- a/edgedbpkg/edgedb/__init__.py
+++ b/edgedbpkg/edgedb/__init__.py
@@ -36,7 +36,7 @@
 
 class EdgeDB(packages.BundledPythonPackage):
     title = "EdgeDB"
-    name = "edgedb-server"
+    name = packages.canonicalize_name("edgedb-server")
     description = "Next generation graph-relational database"
     license_id = "Apache-2.0"
     group = "Applications/Databases"
diff --git a/edgedbpkg/edgedbcli/__init__.py b/edgedbpkg/edgedbcli/__init__.py
index 854eeea5..a5dc49c9 100644
--- a/edgedbpkg/edgedbcli/__init__.py
+++ b/edgedbpkg/edgedbcli/__init__.py
@@ -9,7 +9,7 @@
 
 class EdgeDBCLI(packages.BundledRustPackage):
     title = "EdgeDBCLI"
-    name = "edgedb-cli"
+    name = packages.canonicalize_name("edgedb-cli")
     description = "EdgeDB Command Line Tools"
     license_id = "Apache-2.0"
     group = "Applications/Databases"
diff --git a/edgedbpkg/icu/__init__.py b/edgedbpkg/icu/__init__.py
index 8416b3e3..a7e83fa9 100644
--- a/edgedbpkg/icu/__init__.py
+++ b/edgedbpkg/icu/__init__.py
@@ -6,7 +6,7 @@
 
 class ICU(packages.BundledCPackage):
     title = "ICU"
-    name = "icu"
+    name = packages.canonicalize_name("icu")
     aliases = ["icu-dev"]
 
     _server = "https://github.com/unicode-org/icu/releases/download/"
diff --git a/edgedbpkg/libb2/__init__.py b/edgedbpkg/libb2/__init__.py
index 50df6c6a..813c1e74 100644
--- a/edgedbpkg/libb2/__init__.py
+++ b/edgedbpkg/libb2/__init__.py
@@ -5,9 +5,8 @@
 
 
 class LibB2(packages.BundledCPackage):
-
     title = "libb2"
-    name = "libb2"
+    name = packages.canonicalize_name("libb2")
     aliases = ["libb2-dev"]
 
     _server = "https://github.com/BLAKE2/libb2/releases/download/"
diff --git a/edgedbpkg/libffi/__init__.py b/edgedbpkg/libffi/__init__.py
index b14b9038..22d54e81 100644
--- a/edgedbpkg/libffi/__init__.py
+++ b/edgedbpkg/libffi/__init__.py
@@ -6,7 +6,7 @@
 
 class LibFFI(packages.BundledCPackage):
     title = "libffi"
-    name = "libffi"
+    name = packages.canonicalize_name("libffi")
     aliases = ["libffi-dev"]
 
     _server = "https://github.com/libffi/libffi/releases/download/"
diff --git a/edgedbpkg/libuuid/__init__.py b/edgedbpkg/libuuid/__init__.py
index b731f5d8..f583e5bf 100644
--- a/edgedbpkg/libuuid/__init__.py
+++ b/edgedbpkg/libuuid/__init__.py
@@ -6,7 +6,7 @@
 
 class LibUUID(packages.BundledCPackage):
     title = "uuid"
-    name = "uuid"
+    name = packages.canonicalize_name("uuid")
     aliases = ["uuid-dev"]
 
     _server = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/"
diff --git a/edgedbpkg/openssl/__init__.py b/edgedbpkg/openssl/__init__.py
index 283aeff6..9617e769 100644
--- a/edgedbpkg/openssl/__init__.py
+++ b/edgedbpkg/openssl/__init__.py
@@ -4,7 +4,6 @@
 import platform
 import re
 import shlex
-import textwrap
 
 from metapkg import packages
 from metapkg import targets
@@ -12,7 +11,7 @@
 
 class OpenSSL(packages.BundledCPackage):
     title = "OpenSSL"
-    name = "openssl"
+    name = packages.canonicalize_name("openssl")
     aliases = ["openssl-dev"]
 
     _server = "https://www.openssl.org/source/"
diff --git a/edgedbpkg/pgbundle/__init__.py b/edgedbpkg/pgbundle/__init__.py
index 08ab9877..5cbe60ac 100644
--- a/edgedbpkg/pgbundle/__init__.py
+++ b/edgedbpkg/pgbundle/__init__.py
@@ -17,9 +17,8 @@
 
 
 class PostgreSQLBundle(packages.BundledPackage):
-
     title = "PostgreSQL"
-    name = "postgresql-bundle"
+    name = packages.canonicalize_name("postgresql-bundle")
     group = "Applications/Databases"
 
     sources = [
@@ -28,6 +27,8 @@ class PostgreSQLBundle(packages.BundledPackage):
         },
     ]
 
+    bundle_deps: list[packages.BundledPackage]
+
     @classmethod
     def resolve(
         cls,
diff --git a/edgedbpkg/pgext/pgvector/__init__.py b/edgedbpkg/pgext/pgvector/__init__.py
index d7dbca3f..3eff1c13 100644
--- a/edgedbpkg/pgext/pgvector/__init__.py
+++ b/edgedbpkg/pgext/pgvector/__init__.py
@@ -18,9 +18,8 @@
 
 
 class PgVector(packages.BundledCPackage):
-
     title = "pgvector extension"
-    name = "pgext-pgvector"
+    name = packages.canonicalize_name("pgext-pgvector")
     description = "Open-source vector similarity search for Postgres"
     license_id = "PostgreSQL"
     group = "Applications/Databases"
diff --git a/edgedbpkg/postgresql/__init__.py b/edgedbpkg/postgresql/__init__.py
index 212ee00e..347b9a29 100644
--- a/edgedbpkg/postgresql/__init__.py
+++ b/edgedbpkg/postgresql/__init__.py
@@ -15,7 +15,7 @@
 
 class PostgreSQL(packages.BundledCPackage):
     title = "PostgreSQL"
-    name = "postgresql-edgedb"
+    name = packages.canonicalize_name("postgresql-edgedb")
     group = "Applications/Databases"
 
     sources = [
diff --git a/edgedbpkg/pyentrypoint/__init__.py b/edgedbpkg/pyentrypoint/__init__.py
index 972cc4f4..486dabc5 100644
--- a/edgedbpkg/pyentrypoint/__init__.py
+++ b/edgedbpkg/pyentrypoint/__init__.py
@@ -9,7 +9,7 @@
 
 class PyEntryPoint(packages.BundledRustPackage):
     title = "pyentrypoint"
-    name = "pyentrypoint"
+    name = packages.canonicalize_name("pyentrypoint")
     sources = [
         {
             "url": f"file://{source}",
diff --git a/edgedbpkg/python/__init__.py b/edgedbpkg/python/__init__.py
index c4bd933d..dfd6229e 100644
--- a/edgedbpkg/python/__init__.py
+++ b/edgedbpkg/python/__init__.py
@@ -19,7 +19,7 @@
 
 class Python(packages.BundledCPackage):
     title = "Python"
-    name = "python-edgedb"
+    name = packages.canonicalize_name("python-edgedb")
 
     _pftp = "https://www.python.org/ftp/python/{base_version}/"
 
diff --git a/edgedbpkg/zlib/__init__.py b/edgedbpkg/zlib/__init__.py
index e3478658..4c00f007 100644
--- a/edgedbpkg/zlib/__init__.py
+++ b/edgedbpkg/zlib/__init__.py
@@ -6,7 +6,7 @@
 
 class Zlib(packages.BundledCPackage):
     title = "zlib"
-    name = "zlib"
+    name = packages.canonicalize_name("zlib")
     aliases = ["zlib-dev"]
 
     _server = "https://zlib.net/fossils/"
diff --git a/pyproject.toml b/pyproject.toml
index 2e915778..aebd61a3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ line-length = 79
 target-version = ["py39"]
 
 [tool.mypy]
-files = "edgedbpkg/**/*.py"
+files = "edgedbpkg"
 python_version = "3.9"
 ignore_missing_imports = true
 show_error_codes = true