diff --git a/release/packages/acpi.ucl b/release/packages/acpi.ucl
index e5be3aa3c78..432f223d388 100644
--- a/release/packages/acpi.ucl
+++ b/release/packages/acpi.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-acpi"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "ACPI tools"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/at.ucl b/release/packages/at.ucl
index 7c149d6c9b6..7ff7ce54a8e 100644
--- a/release/packages/at.ucl
+++ b/release/packages/at.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-at"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "at(1) and related utilities"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bhyve.ucl b/release/packages/bhyve.ucl
index 3ef2c8f6860..821eefd2c31 100644
--- a/release/packages/bhyve.ucl
+++ b/release/packages/bhyve.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bhyve"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "The BSD Hypervisor"
diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl
index f663595c56a..fee0e5886e8 100644
--- a/release/packages/binutils.ucl
+++ b/release/packages/binutils.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-binutils"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "GNU binutils"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsdinstall.ucl b/release/packages/bsdinstall.ucl
index 49a742ff755..8de28f108ef 100644
--- a/release/packages/bsdinstall.ucl
+++ b/release/packages/bsdinstall.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsdinstall"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Installer"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp-development.ucl b/release/packages/bsnmp-development.ucl
index d17d9e0feac..acfcd511bde 100644
--- a/release/packages/bsnmp-development.ucl
+++ b/release/packages/bsnmp-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp-development"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP development"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp-lib32-development.ucl b/release/packages/bsnmp-lib32-development.ucl
index 12e9e982e35..b24242130bc 100644
--- a/release/packages/bsnmp-lib32-development.ucl
+++ b/release/packages/bsnmp-lib32-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp-lib32-development"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP 32bits development"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp-lib32-profile.ucl b/release/packages/bsnmp-lib32-profile.ucl
index 4a3913a8719..86e583bf2f8 100644
--- a/release/packages/bsnmp-lib32-profile.ucl
+++ b/release/packages/bsnmp-lib32-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP 32bits libraries (profiling)"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp-lib32.ucl b/release/packages/bsnmp-lib32.ucl
index 913ed3a6834..9f40abd1929 100644
--- a/release/packages/bsnmp-lib32.ucl
+++ b/release/packages/bsnmp-lib32.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP 32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp-profile.ucl b/release/packages/bsnmp-profile.ucl
index 9472192f711..b71d905f81e 100644
--- a/release/packages/bsnmp-profile.ucl
+++ b/release/packages/bsnmp-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp-profile"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP libraries (profiling)"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/bsnmp.ucl b/release/packages/bsnmp.ucl
index 43915d360c4..91bbf2035b2 100644
--- a/release/packages/bsnmp.ucl
+++ b/release/packages/bsnmp.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-bsnmp"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "SNMP daemon and userland tools"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/clang.ucl b/release/packages/clang.ucl
index 7f0cf1d7afe..a00d1917e83 100644
--- a/release/packages/clang.ucl
+++ b/release/packages/clang.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-clang"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Clang compiler tools"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/dma.ucl b/release/packages/dma.ucl
index 4495ff3ea67..c470e28d78f 100644
--- a/release/packages/dma.ucl
+++ b/release/packages/dma.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-dma"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "DragonFly Mail Agent"
diff --git a/release/packages/gdb.ucl b/release/packages/gdb.ucl
index 812fc695cf4..1116b52c3e1 100644
--- a/release/packages/gdb.ucl
+++ b/release/packages/gdb.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-gdb"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "GNU gdb"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/groff.ucl b/release/packages/groff.ucl
index f979ccaabe1..f5baf1aa712 100644
--- a/release/packages/groff.ucl
+++ b/release/packages/groff.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-groff"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "GNU groff"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/lib32-development.ucl b/release/packages/lib32-development.ucl
index 6f6e0ee2645..eef856674c2 100644
--- a/release/packages/lib32-development.ucl
+++ b/release/packages/lib32-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-lib32-development"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/lib32-profile.ucl b/release/packages/lib32-profile.ucl
index 59ed8ea934d..eef856674c2 100644
--- a/release/packages/lib32-profile.ucl
+++ b/release/packages/lib32-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-lib32-profile"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/lib32.ucl b/release/packages/lib32.ucl
index 4ebecac1e68..eef856674c2 100644
--- a/release/packages/lib32.ucl
+++ b/release/packages/lib32.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh-development.ucl b/release/packages/ssh-development.ucl
index 7b7dc04b6c0..d7c72eb0400 100644
--- a/release/packages/ssh-development.ucl
+++ b/release/packages/ssh-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh-lib32-development.ucl b/release/packages/ssh-lib32-development.ucl
index 0ea66702a6a..ffad90ec6c3 100644
--- a/release/packages/ssh-lib32-development.ucl
+++ b/release/packages/ssh-lib32-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell 32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh-lib32-profile.ucl b/release/packages/ssh-lib32-profile.ucl
index 0ea66702a6a..ffad90ec6c3 100644
--- a/release/packages/ssh-lib32-profile.ucl
+++ b/release/packages/ssh-lib32-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell 32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh-lib32.ucl b/release/packages/ssh-lib32.ucl
index 0ea66702a6a..ffad90ec6c3 100644
--- a/release/packages/ssh-lib32.ucl
+++ b/release/packages/ssh-lib32.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell 32bits libraries"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh-profile.ucl b/release/packages/ssh-profile.ucl
index 7b7dc04b6c0..d7c72eb0400 100644
--- a/release/packages/ssh-profile.ucl
+++ b/release/packages/ssh-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/ssh.ucl b/release/packages/ssh.ucl
index 7b7dc04b6c0..d7c72eb0400 100644
--- a/release/packages/ssh.ucl
+++ b/release/packages/ssh.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-ssh"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Secure SHell"
@@ -9,5 +9,5 @@ prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
 desc = <<EOD
-TODO
+%DESC%
 EOD
diff --git a/release/packages/svn.ucl b/release/packages/svn.ucl
index c640686f549..d3d8aad0df0 100644
--- a/release/packages/svn.ucl
+++ b/release/packages/svn.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-svn"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Version control system"
diff --git a/release/packages/syscons.ucl b/release/packages/syscons.ucl
index 9ef44382a38..ef483680383 100644
--- a/release/packages/syscons.ucl
+++ b/release/packages/syscons.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-syscons"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "syscons(4) support files"
diff --git a/release/packages/tests.ucl b/release/packages/tests.ucl
index d4fc9b70b7b..c78cd7096fd 100644
--- a/release/packages/tests.ucl
+++ b/release/packages/tests.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-tests"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
diff --git a/release/packages/unbound-development.ucl b/release/packages/unbound-development.ucl
index 65ad1ad9d39..084683510dc 100644
--- a/release/packages/unbound-development.ucl
+++ b/release/packages/unbound-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver"
diff --git a/release/packages/unbound-lib32-development.ucl b/release/packages/unbound-lib32-development.ucl
index 65ad1ad9d39..084683510dc 100644
--- a/release/packages/unbound-lib32-development.ucl
+++ b/release/packages/unbound-lib32-development.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver"
diff --git a/release/packages/unbound-lib32-profile.ucl b/release/packages/unbound-lib32-profile.ucl
index 65ad1ad9d39..084683510dc 100644
--- a/release/packages/unbound-lib32-profile.ucl
+++ b/release/packages/unbound-lib32-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver"
diff --git a/release/packages/unbound-lib32.ucl b/release/packages/unbound-lib32.ucl
index ea9b7177961..2b0170a21f8 100644
--- a/release/packages/unbound-lib32.ucl
+++ b/release/packages/unbound-lib32.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound-lib32"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver, 32bits libraries"
diff --git a/release/packages/unbound-profile.ucl b/release/packages/unbound-profile.ucl
index 65ad1ad9d39..084683510dc 100644
--- a/release/packages/unbound-profile.ucl
+++ b/release/packages/unbound-profile.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver"
diff --git a/release/packages/unbound.ucl b/release/packages/unbound.ucl
index 65ad1ad9d39..084683510dc 100644
--- a/release/packages/unbound.ucl
+++ b/release/packages/unbound.ucl
@@ -1,4 +1,4 @@
-name = "FreeBSD-unbound"
+name = "FreeBSD-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "Validating, recursive, and caching DNS resolver"