diff --git a/dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild b/dev-php/securimage/securimage-2.0.1.ebuild
copy from dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild
copy to dev-php/securimage/securimage-2.0.1.ebuild
--- a/dev-php/phpcaptcha/phpcaptcha-2.0.1.ebuild
+++ b/dev-php/securimage/securimage-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.9.ebuild,v 1.12 2009/11/04 12:12:05 arfrever Exp $
 
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="PHP captcha creator and validator library"
 HOMEPAGE="http://phpcaptcha.org/"
-SRC_URI="mirror://ohnoproto/${P}.tar.gz"
+SRC_URI="mirror://ohnoproto/phpcaptcha-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,20 +18,20 @@ IUSE=""
 S=${WORKDIR}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-pic.patch
+	epatch "${FILESDIR}"/phpcaptcha-${PV}-pic.patch
 
 	mkdir securimage-doc || die
-	mv -v securimage/README* securimage-doc/ || die
+	mv -v ${PN}/README* securimage-doc/ || die
 
 	# it's good that the license is distributed, we just don't want to
 	# install it below.
-	rm -v securimage/LICENSE.txt || die
+	rm -v ${PN}/LICENSE.txt || die
 }
 
 src_install()
 {
 	insinto /usr/share/php
-	doins -r securimage || die
+	doins -r ${PN} || die
 
 	dodoc securimage-doc/* || die
 }