diff --git a/MOVED b/MOVED
index 1265eb2764cb..f2ae352985aa 100644
--- a/MOVED
+++ b/MOVED
@@ -15738,3 +15738,4 @@ graphics/geeqie-devel|graphics/geeqie|2020-12-04|Development version no longer n
 devel/py-microversion_parse|devel/py-microversion-parse|2020-12-05|Rename to match upstream naming
 devel/py-semantic_version|devel/py-semantic-version|2020-12-05|Rename to match upstream naming
 devel/py-wsgi_intercept|devel/py-wsgi-intercept|2020-12-05|Rename to match upstream naming
+net/py-ndg_httpsclient|net/py-ndg-httpsclient|2020-12-05|Rename to match upstream naming
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index fd0ed5b7ace2..f1f8885d6f5e 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmusicapi
 PORTVERSION=	11.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ndg-httpsclient>0:net/py-ndg-httpsclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mechanicalsoup>0:www/py-mechanicalsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg-httpsclient/Makefile
similarity index 85%
rename from net/py-ndg_httpsclient/Makefile
rename to net/py-ndg-httpsclient/Makefile
index fb61ac0ec6f8..cc6b4451639d 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg-httpsclient/Makefile
@@ -1,12 +1,13 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
-PORTNAME=	ndg_httpsclient
+PORTNAME=	ndg-httpsclient
 PORTVERSION=	0.5.1
 PORTREVISION=	1
 CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP/source/n/ndg-httpsclient
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	ndg_httpsclient-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Enhance HTTPS support for httplib and urllib2
@@ -17,8 +18,9 @@ LICENSE_FILE=	${WRKSRC}/ndg/httpsclient/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR}
 
-NO_ARCH=	yes
-USE_PYTHON=	autoplist concurrent distutils
 USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/py-ndg_httpsclient/distinfo b/net/py-ndg-httpsclient/distinfo
similarity index 100%
rename from net/py-ndg_httpsclient/distinfo
rename to net/py-ndg-httpsclient/distinfo
diff --git a/net/py-ndg_httpsclient/pkg-descr b/net/py-ndg-httpsclient/pkg-descr
similarity index 100%
rename from net/py-ndg_httpsclient/pkg-descr
rename to net/py-ndg-httpsclient/pkg-descr
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index db755711fd51..e38d451669a6 100644
--- a/security/py-gpsoauth/Makefile
+++ b/security/py-gpsoauth/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpsoauth
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ndg-httpsclient>0:net/py-ndg-httpsclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
diff --git a/www/searx/Makefile b/www/searx/Makefile
index 33eddc843c8a..a1adf793f127 100644
--- a/www/searx/Makefile
+++ b/www/searx/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	searx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 
 MAINTAINER=	loic.blot@unix-experience.fr
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ndg-httpsclient>0:net/py-ndg-httpsclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PY_PYGMENTS} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \