Index: head/astro/py-horoscopegenerator/Makefile
===================================================================
--- head/astro/py-horoscopegenerator/Makefile	(revision 419690)
+++ head/astro/py-horoscopegenerator/Makefile	(revision 419691)
@@ -1,22 +1,21 @@
 # $FreeBSD$
 
-PORTNAME=	horoscopegenerator
+PORTNAME=	HoroscopeGenerator
 PORTVERSION=	0.1.8
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
-DISTNAME=	${PORTNAME:S/h/H/:S/g/G/}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Generate horoscopes using context-free grammar
 
 LICENSE=	MIT
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk
 
 .include <bsd.port.mk>
Index: head/audio/py-speechrecognition/Makefile
===================================================================
--- head/audio/py-speechrecognition/Makefile	(revision 419690)
+++ head/audio/py-speechrecognition/Makefile	(revision 419691)
@@ -1,29 +1,28 @@
 # $FreeBSD$
 
-PORTNAME=	speechrecognition
+PORTNAME=	SpeechRecognition
 PORTVERSION=	3.4.6
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
-DISTNAME=	${PORTNAME:S/s/S/:S/r/R/}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Python Library for performing speech recognition
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	flac:audio/flac \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic
 .endif
 
 .include <bsd.port.post.mk>