diff --git a/configs/bananapim1_defconfig b/configs/bananapim1_defconfig
index 7f19f87bf9..d9d19282cc 100644
--- a/configs/bananapim1_defconfig
+++ b/configs/bananapim1_defconfig
@@ -52,7 +52,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -64,8 +64,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/nanopineo2_defconfig b/configs/nanopineo2_defconfig
index 992d425ca7..1feefcbc06 100644
--- a/configs/nanopineo2_defconfig
+++ b/configs/nanopineo2_defconfig
@@ -44,7 +44,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -56,8 +56,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/nanopineo_defconfig b/configs/nanopineo_defconfig
index c6697604bf..858c6a5a0b 100644
--- a/configs/nanopineo_defconfig
+++ b/configs/nanopineo_defconfig
@@ -44,7 +44,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -56,8 +56,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index 2a9000ec43..efd0675534 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -57,7 +57,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_SEMVER_SORT=y
@@ -68,8 +68,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index f3107c5b9c..45dcb5afa5 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -44,7 +44,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -56,8 +56,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 7b940efca4..bc9c432ede 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -47,7 +47,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -59,8 +59,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig
index 799d726bf1..eda1766110 100644
--- a/configs/orangepione_defconfig
+++ b/configs/orangepione_defconfig
@@ -47,7 +47,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -59,8 +59,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/orangepizero_defconfig b/configs/orangepizero_defconfig
index 6340709e0f..e4e44dd416 100644
--- a/configs/orangepizero_defconfig
+++ b/configs/orangepizero_defconfig
@@ -47,7 +47,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -59,8 +59,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index 08b43aeab4..15730a1d83 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -43,7 +43,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -55,8 +55,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index ffcddb6822..6df7bab13e 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -50,7 +50,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -62,8 +62,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index daac3ae10e..f82f03ea15 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -50,12 +50,11 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
 BR2_PACKAGE_SEMVER_SORT=y
-BR2_PACKAGE_SEMVER_SORT=y
 BR2_PACKAGE_AUTOSSH=y
 BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DHCP=y
@@ -63,8 +62,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig
index e201f941c7..2c45302387 100644
--- a/configs/raspberrypi4_defconfig
+++ b/configs/raspberrypi4_defconfig
@@ -50,7 +50,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -62,8 +62,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index fdb2b7fa79..152ec46c67 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -57,7 +57,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -69,8 +69,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y
diff --git a/configs/tinkerboard_defconfig b/configs/tinkerboard_defconfig
index bb048c7115..9b2d17222d 100644
--- a/configs/tinkerboard_defconfig
+++ b/configs/tinkerboard_defconfig
@@ -47,7 +47,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_PCRE=y
 BR2_PACKAGE_PCRE_UCP=y
@@ -59,8 +59,8 @@ BR2_PACKAGE_DHCP_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NET_TOOLS=y
+BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_NTP=y
 BR2_PACKAGE_NTP_SNTP=y
 BR2_PACKAGE_OPENSSH=y