package-$(BR2_PACKAGE_FPING) += fping
package-$(BR2_PACKAGE_FPROBE) += fprobe
package-$(BR2_PACKAGE_FUSE) += fuse
-package-$(BR2_PACKAGE_GLIB1) += glib
+package-$(BR2_PACKAGE_GLIB) += glib
package-$(BR2_PACKAGE_HASERL) += haserl
package-$(BR2_PACKAGE_IPKG) += ipkg
package-$(BR2_PACKAGE_IPTABLES) += iptables
package-$(BR2_PACKAGE_L2TPD) += l2tpd
package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
package-$(BR2_PACKAGE_LIBELF) += libelf
-package-$(BR2_PACKAGE_LIBGMP) += gmp
-package-$(BR2_PACKAGE_LIBLZO) += lzo
+package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_PACKAGE_LZO) += lzo
package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
package-$(BR2_PACKAGE_LIBUSB) += libusb
package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
package-$(BR2_PACKAGE_LIBGD) += libgd
package-$(BR2_PACKAGE_LIBNET) += libnet
-package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql
+package-$(BR2_PACKAGE_MYSQL) += mysql
package-$(BR2_PACKAGE_LIBPCAP) += libpcap
package-$(BR2_PACKAGE_LIBPNG) += libpng
-package-$(BR2_PACKAGE_LIBPQ) += postgresql
-package-$(BR2_PACKAGE_LIBSASL2) += cyrus-sasl
-package-$(BR2_PACKAGE_LIBLTDL) += libtool
+package-$(BR2_PACKAGE_POSTGRESQL) += postgresql
+package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_PACKAGE_LIBTOOL) += libtool
package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
package-$(BR2_PACKAGE_SIPROXD) += siproxd
package-$(BR2_PACKAGE_SIPSAK) += sipsak
package-$(BR2_PACKAGE_HTPDATE) += htpdate
package-$(BR2_PACKAGE_HOWL) += howl
package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
-package-$(BR2_PACKAGE_OSIRISD) += osiris
+package-$(BR2_PACKAGE_OSIRIS) += osiris
package-$(BR2_PACKAGE_PMACCT) += pmacct
package-$(BR2_PACKAGE_ULOGD) += ulogd
package-$(BR2_PACKAGE_VSFTPD) += vsftpd