diff --git a/packages/aws-lc/pkgbuild.py b/packages/aws-lc/pkgbuild.py
index c72f660..b35d9bc 100644
--- a/packages/aws-lc/pkgbuild.py
+++ b/packages/aws-lc/pkgbuild.py
@@ -16,10 +16,24 @@ def build():
 
 on_build(build)
 
-package("aws-lc")
-cpp.use_auto_pack(["lib"])
 
-package("aws-lc-bin")
+def pack_libcrypto(composer):
+    composer.makedir("lib")
+    composer.addfile("lib/libcrypto.so", "lib/libcrypto.so")
+
+
+def pack_libssl(composer):
+    composer.makedir("lib")
+    composer.addfile("lib/libssl.so", "lib/libssl.so")
+
+
+package("aws-lc-libcrypto")
+on_pack(pack_libcrypto)
+
+package("aws-lc-libssl")
+on_pack(pack_libssl)
+
+package("aws-lc-tools")
 cpp.use_auto_pack(["bin"])
 
 package("aws-lc-dev")
diff --git a/packages/libarchive/pkgbuild.py b/packages/libarchive/pkgbuild.py
index 5e4b644..56529aa 100644
--- a/packages/libarchive/pkgbuild.py
+++ b/packages/libarchive/pkgbuild.py
@@ -18,7 +18,7 @@ on_build(build)
 package("libarchive")
 cpp.use_auto_pack(["lib"])
 
-package("libarchive-bin")
+package("libarchive-tools")
 cpp.use_auto_pack(["bin"])
 
 package("libarchive-dev")
diff --git a/packages/sqlite/pkgbuild.py b/packages/sqlite/pkgbuild.py
index ce5d05a..abf0823 100644
--- a/packages/sqlite/pkgbuild.py
+++ b/packages/sqlite/pkgbuild.py
@@ -20,11 +20,11 @@ def build():
 
 on_build(build)
 
-package("sqlite")
+package("libsqlite")
 cpp.use_auto_pack(["lib"])
 
-package("sqlite-bin")
+package("sqlite")
 cpp.use_auto_pack(["bin"])
 
-package("sqlite-dev")
+package("libsqlite-dev")
 cpp.use_auto_pack(["dev"])
diff --git a/packages/zlib-ng/pkgbuild.py b/packages/zlib-ng/pkgbuild.py
index cd33702..27f4113 100644
--- a/packages/zlib-ng/pkgbuild.py
+++ b/packages/zlib-ng/pkgbuild.py
@@ -16,11 +16,11 @@ def build():
 
 on_build(build)
 
-package("zlib-ng")
+package("libz-ng")
 cpp.use_auto_pack(["lib"])
 
-package("zlib-ng-bin")
+package("zlib-ng-tools")
 cpp.use_auto_pack(["bin"])
 
-package("zlib-ng-dev")
+package("libz-ng-dev")
 cpp.use_auto_pack(["dev"])
diff --git a/packages/zstd/pkgbuild.py b/packages/zstd/pkgbuild.py
index 43f9e16..2c1887e 100644
--- a/packages/zstd/pkgbuild.py
+++ b/packages/zstd/pkgbuild.py
@@ -17,11 +17,11 @@ def build():
 
 on_build(build)
 
-package("zstd")
+package("libzstd")
 cpp.use_auto_pack(["lib"])
 
-package("zstd-bin")
+package("zstd")
 cpp.use_auto_pack(["bin"])
 
-package("zstd-dev")
+package("libzstd-dev")
 cpp.use_auto_pack(["dev"])