59 files changed, 59 insertions, 59 deletions

diff --git a/meta/classes/openmoko-base.bbclass b/meta/classes/openmoko-base.bbclass
index d7be1c2932..b8b41197a9 100644
--- a/meta/classes/openmoko-base.bbclass
+++ b/meta/classes/openmoko-base.bbclass
@@ -13,7 +13,7 @@ def openmoko_base_get_subdir(d):
 
 SUBDIR = "${@openmoko_base_get_subdir(d)}"
 
-SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${datadir}/icons"
diff --git a/meta/classes/openmoko2.bbclass b/meta/classes/openmoko2.bbclass
index 233c721ff7..2d9f71a5e2 100644
--- a/meta/classes/openmoko2.bbclass
+++ b/meta/classes/openmoko2.bbclass
@@ -22,7 +22,7 @@ def openmoko_two_get_subdir(d):
 LICENSE = "${@openmoko_two_get_license(d)}"
 SUBDIR = "${@openmoko_two_get_subdir(d)}"
 
-SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${BPN};proto=http"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${datadir}/icons"
diff --git a/meta/classes/xfce.bbclass b/meta/classes/xfce.bbclass
index 95778ee39e..d21bb42d46 100644
--- a/meta/classes/xfce.bbclass
+++ b/meta/classes/xfce.bbclass
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2"
 DEPENDS += "startup-notification"
 
 XFCE_VERSION = ${PV}
-SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${BPN}-${PV}.tar.bz2"
 
 inherit autotools
 
diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb
index a2fd24be82..64f541c343 100644
--- a/meta/recipes-bsp/setserial/setserial_2.17.bb
+++ b/meta/recipes-bsp/setserial/setserial_2.17.bb
@@ -11,7 +11,7 @@ PR = "r3"
 
 inherit autotools
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${PN}-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \
            file://add_stdlib.patch \
           "
 
diff --git a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
index 675ab1798a..4094aeb6b4 100644
--- a/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
+++ b/meta/recipes-connectivity/bind/bind_9.7.2-P3.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fe11ac92dcbd84134d91b6e2c2eccab5"
 DEPENDS = "openssl"
 PR = "r0"
 
-SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${PN}-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
            file://conf.patch \
            file://cross-build-fix.patch \
            "
diff --git a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
index 0b8f51eadd..5d981af95b 100644
--- a/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
+++ b/meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb
@@ -5,7 +5,7 @@ LICENSE =       "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS =       "gettext libgalago dbus glib-2.0"
 
-SRC_URI =       "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz "
+SRC_URI =       "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz "
 
 SRC_URI[md5sum] = "fdb81f938f86f380b127158ebb542279"
 SRC_URI[sha256sum] = "db42a0d1d0f8b069ea5ac1203207f9178f25ac1367f4910bd48547f5be1db4c2"
diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
index 0693ff6c1c..b1b8ce7464 100644
--- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
+++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
 
 DEPENDS =       "gettext dbus glib-2.0 dbus-glib"
 
-SRC_URI =       "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
+SRC_URI =       "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz \
                  file://mkdir.patch;patch=1 \
                  file://pkgconfig.patch;patch=1 "
 
diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
index 77552086cb..3c8c6983ec 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.9.0.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "glib-2.0 libsoup-2.4 libglade"
 
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \
            file://introspection.patch"
 
 SRC_URI[md5sum] = "725c32e8f92a072cc34f0e091937df2a"
diff --git a/meta/recipes-connectivity/gupnp/gupnp-av_0.7.0.bb b/meta/recipes-connectivity/gupnp/gupnp-av_0.7.0.bb
index c43fdd9e9e..fef907e93c 100644
--- a/meta/recipes-connectivity/gupnp/gupnp-av_0.7.0.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-av_0.7.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://libgupnp-av/gupnp-av.h;beginline=1;endline=22;md5=d344132a8766641fcb11213ff5982086"
 DEPENDS = "gupnp"
 
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz"
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
 
 PR = "r0"
 
diff --git a/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.1.bb b/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.1.bb
index 98b2dc0176..008d0f7661 100644
--- a/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.1.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp-tools_0.8.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/network-light/main.c;beginline=1;endline=21;md5=033bf37c030780c5a72165846b3003f6"
 DEPENDS = "gupnp gtk+ libglade gnome-icon-theme"
 
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz"
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
 
 PR = "r0"
 
diff --git a/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
index 9f2d717c76..43a3645dfc 100644
--- a/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.14.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1"
 DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme"
 
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${PN}-${PV}.tar.gz \
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \
            file://introspection.patch"
 
 SRC_URI[md5sum] = "8598922256faa5adb28657d0c10a3e3e"
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb
index cbc7234aba..0ee3ca85fc 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.7.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
 PR = "r0"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz"
 
 SRC_URI[md5sum] = "5ee3aa5c6e1112922b11711e6a209331"
 SRC_URI[sha256sum] = "b65df4f8ebdf1039e1f1e406f53cc7b6106fab6c4d8e784e360709f8d85df0c3"
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index 7c83393899..8182362625 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 RDEPENDS_${PN} += "python-dbus"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz \
            file://parallel_make.patch"
 
 PR = "r1"
diff --git a/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb b/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb
index 8e854c1838..3fdd9acdca 100644
--- a/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb
+++ b/meta/recipes-connectivity/zeroconf/zeroconf_0.9.bb
@@ -17,7 +17,7 @@ PRIORITY = "optional"
 
 PR = "r1"
 
-SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.gz \
            file://compilefix.patch;patch=1 \
            file://zeroconf-default \
            file://debian-zeroconf"
diff --git a/meta/recipes-devtools/insserv/insserv_1.14.0.bb b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
index ec43b3bf12..2d2e75a20a 100644
--- a/meta/recipes-devtools/insserv/insserv_1.14.0.bb
+++ b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 PR = "r0"
 
-SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${PN}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.bz2 \
            file://makefile.patch \
            file://disable_runtests.patch \
            file://insserv.conf"
diff --git a/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/meta/recipes-devtools/perl/libxml-perl_0.08.bb
index 04a78e34d0..9c74cdb6b3 100644
--- a/meta/recipes-devtools/perl/libxml-perl_0.08.bb
+++ b/meta/recipes-devtools/perl/libxml-perl_0.08.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=33;endline=35;md5=1705549eef7577a3d6
 
 DEPENDS += "libxml-parser-perl"
 
-SRC_URI = "http://www.cpan.org/modules/by-module/XML/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.cpan.org/modules/by-module/XML/${BPN}-${PV}.tar.gz"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta/recipes-extended/iputils/iputils_s20101006.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb
index c4db5b4746..a7ef40cf3e 100644
--- a/meta/recipes-extended/iputils/iputils_s20101006.bb
+++ b/meta/recipes-extended/iputils/iputils_s20101006.bb
@@ -15,7 +15,7 @@ DEPENDS = "sysfsutils openssl docbook-utils-native"
 
 PR = "r0"
 
-SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \
+SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
            file://debian/fix-dead-host-ping-stats.diff \
            file://debian/add-icmp-return-codes.diff \
            file://debian/use_gethostbyname2.diff \
diff --git a/meta/recipes-extended/less/less_436.bb b/meta/recipes-extended/less/less_436.bb
index dcd73bda84..e6c8c71508 100644
--- a/meta/recipes-extended/less/less_436.bb
+++ b/meta/recipes-extended/less/less_436.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 DEPENDS = "ncurses"
 PR = "r0"
 
-SRC_URI = "http://www.greenwoodsoftware.com/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "817bf051953ad2dea825a1cdf460caa4"
 SRC_URI[sha256sum] = "57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2"
diff --git a/meta/recipes-extended/man-pages/man-pages_3.32.bb b/meta/recipes-extended/man-pages/man-pages_3.32.bb
index daf22bc3c6..3c069f2eac 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.32.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.32.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 PR = "r1"
 
 LIC_FILES_CHKSUM = "file://README;md5=0422377a748010b2b738342e24f141c1"
-SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "cc6c2d4d4eb364fd8da718c412db09d4"
 SRC_URI[sha256sum] = "61ef2fc36421e72eb92d1f533576a439a2fcdae20269393f740dd98abd8be519"
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index f1c9754434..57aeb9c75f 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -10,7 +10,7 @@ DEPENDS = "groff less"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-SRC_URI = "http://primates.ximian.com/~flucifredi/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
            file://man-1.5k-confpath.patch;striplevel=0 \
            file://man-1.5h1-make.patch;striplevel=1 \
            file://man-1.5k-nonascii.patch;striplevel=1 \
diff --git a/meta/recipes-extended/mc/mc_4.7.5.bb b/meta/recipes-extended/mc/mc_4.7.5.bb
index 2898f2cd8b..ec84b01cd6 100644
--- a/meta/recipes-extended/mc/mc_4.7.5.bb
+++ b/meta/recipes-extended/mc/mc_4.7.5.bb
@@ -10,7 +10,7 @@ PR = "r1"
 
 PR = "r0"
 
-SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "4eb2438b168fb0f93b748889a9294f54"
 SRC_URI[sha256sum] = "0d2b4e87b8a4158edf54380df9402b4a1a19f7494ef06dd0a0a3e3ff6a2b50f1"
diff --git a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb b/meta/recipes-extended/mdadm/mdadm_3.1.4.bb
index 99ca33605f..8c13b93579 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.1.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.1.4.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 PR = "r1"
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
            file://fix-z-now.patch;striplevel=0"
 
 SRC_URI[md5sum] = "0e7dcb5cc4192ae3abd9956bac475576"
diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.23.bb b/meta/recipes-extended/msmtp/msmtp_1.4.23.bb
index d72677cad2..cb3d83c716 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.23.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.23.bb
@@ -12,7 +12,7 @@ PR = "r0"
 #COPYING or Licence
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.bz2 \
           "
 
 SRC_URI[md5sum] = "5fb7ae88186624cdb125d3efad3fdc16"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index 17fff1c53c..55868abf7f 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -13,7 +13,7 @@ PR = "r1"
 
 FILES_${PN} += "${datadir}/*"
 
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.31/${PN}-${PV}.tar.bz2 \
+SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
            file://iconpath-option.patch"
 
 SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed"
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
index 8670ad8215..5ebd8bfca7 100644
--- a/meta/recipes-graphics/libfakekey/libfakekey_git.bb
+++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
@@ -12,7 +12,7 @@ SECTION = "x11/wm"
 PV = "0.0+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
index 3bc912ba41..b2cf46dd4d 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.9.bb
@@ -2,7 +2,7 @@ require libmatchbox.inc
 
 PR = "r8"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
            file://16bppfixes.patch;patch=1 \
            file://configure_fixes.patch;patch=1 \
            file://check.m4 \
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
index f916889cc3..01106d593b 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_git.bb
@@ -4,7 +4,7 @@ PV = "1.9+git${SRCPV}"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git \
            file://configure_fixes.patch;patch=1 \
            file://check.m4 \
            file://16bppfixes.patch;patch=1 \
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index 504a8b7009..0d72e933f5 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -13,7 +13,7 @@ DEPENDS = "virtual/libx11 virtual/libgl glew"
 
 PR = "r1"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
         file://dso_linking_change_build_fix.patch"
 
 inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
index da910519e0..70afb73c2f 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
+++ b/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
@@ -20,7 +20,7 @@ DEPENDS = "virtual/libx11 libsm xcb-util"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "bca0ed1c74bc4e483ea2ed12a5717354"
 SRC_URI[sha256sum] = "64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459"
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
index f6bf0ce66f..d910cff2bb 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
@@ -15,7 +15,7 @@ PE = "1"
 PR = "r0"
 
 FONTREV = "0.20100721"
-SRC_URI = "https://fedorahosted.org/releases/l/i/${PN}/${PN}-${PV}.${FONTREV}.tar.gz \
+SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
            file://30-liberation-aliases.conf"
 
 S = ${WORKDIR}/${PN}-${PV}.${FONTREV}
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
index 98731dbb84..6eb5f6c1aa 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.11.bb
@@ -16,7 +16,7 @@ DEPENDS = "gstreamer gst-plugins-base zlib"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
+SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://lower-rank.diff \
 "
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
index 0ec4b12386..c53d2775bb 100644
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
@@ -6,7 +6,7 @@ DEPENDS = "gstreamer zlib"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://core.fluendo.com/gstreamer/src/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://core.fluendo.com/gstreamer/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index 4edca95611..617aab8adb 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -9,7 +9,7 @@ inherit autotools pkgconfig
 
 FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
 
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
 
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
index 861e6fc72f..d6fb2f45ed 100644
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "expat neon"
 
 PR = "r2"
 
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${PN}-${PV}.tar.gz \
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \
            file://fix_build_issue_for_gcc_4.5.0.patch "
 
 SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.4.3.bb b/meta/recipes-qt/qt-apps/qmmp_0.4.3.bb
index b01c616607..ea70312d8f 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.4.3.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.4.3.bb
@@ -9,7 +9,7 @@ PR = "r0"
 DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
 RDEPENDS_${PN} += "taglib alsa-lib curl"
 
-SRC_URI = "http://qmmp.ylsoftware.com/files/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "b79ce55ed8aca31a29360ff828ce1881"
 SRC_URI[sha256sum] = "a75c2c676515182ecfbe811cba29ba4ca736912e52fde283db4d03eb116457a4"
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
index 594b03736b..037da2e30c 100644
--- a/meta/recipes-sato/gaku/gaku_svn.bb
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
@@ -19,7 +19,7 @@ PV = "0.0+svnr${SRCPV}"
 
 PR = "r4"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 5024e7cf4a..f2b3a7c0eb 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 DEPENDS = "gtk+ intltool-native"
 DEPENDS_append_poky = " libowl"
-SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
            file://leafpad.desktop"
 
 SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
diff --git a/meta/recipes-sato/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_svn.bb
index 74d0d77981..81ebf8e5b0 100644
--- a/meta/recipes-sato/libowl/libowl_svn.bb
+++ b/meta/recipes-sato/libowl/libowl_svn.bb
@@ -13,7 +13,7 @@ DEPENDS = "gtk+"
 PV = "0.0+svnr${SRCPV}"
 PR = "r6"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
index 9f4e4d3e01..c5c80629d5 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
@@ -14,7 +14,7 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git \
         file://no-handed.patch;patch=1;pnum=0"
 
 inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
index 09f79138ca..9e95df4e88 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb
@@ -13,7 +13,7 @@ SECTION = "x11/wm"
 PV = "2.0+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.pokylinux.org/${PN}-2;protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN}-2;protocol=git \
            file://dso_linking_change_build_fix.patch"
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 245f999335..e2cacb0b1d 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -13,7 +13,7 @@ SECTION = "x11"
 PV = "0.0+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git \
            file://configure_fix.patch;patch=1;maxrev=1819 \
            file://single-instance.patch;patch=1 \
            file://80matchboxkeyboard.shbg"
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 256b5a22da..3f4f1f9a07 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -19,7 +19,7 @@ RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
 RCONFLICTS_${PN} = "matchbox-panel"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git \
            file://startup_fix.diff;patch=1"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index 8077a56e1c..f36a33941e 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -10,7 +10,7 @@ SECTION = "x11/wm"
 PV = "0.0+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git \
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git \
            file://single-instance.patch;patch=1 \
            file://configure_fix.patch;patch=1;maxrev=1819 \
            file://dso_linking_change_build_fix.patch "
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
index c26c33861f..b1ad1ea8c8 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_git.bb
@@ -11,7 +11,7 @@ SECTION = "x11/utils"
 PV = "0.0+git${SRCPV}"
 PR = "r0"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
+SRC_URI = "git://git.pokylinux.org/${BPN};protocol=git"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
index b9612c0741..99d0df7a0c 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
@@ -17,7 +17,7 @@ PR = "r6"
 
 S = "${WORKDIR}/${PN}"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
            file://gst_change_state.patch \
            file://make-382.patch"
 
diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
index a9e3f15ad1..df87ac5fd3 100644
--- a/meta/recipes-sato/pimlico/contacts_0.9.bb
+++ b/meta/recipes-sato/pimlico/contacts_0.9.bb
@@ -2,4 +2,4 @@ require contacts.inc
 
 PR = "r3"
 
-SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
index 0d2e235e56..a86ecc4e53 100644
--- a/meta/recipes-sato/pimlico/contacts_git.bb
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
@@ -10,7 +10,7 @@ PR = "r2"
 
 S = "${WORKDIR}/git"
 
-SRC_URI =+ "git://git.gnome.org/${PN};protocol=git \
+SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
             file://make-382.patch"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 973c42d85a..f0a12f8185 100644
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -10,6 +10,6 @@ PR = "r3"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://git.gnome.org/${PN};protocol=git \
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
            file://make-382.patch \
            file://dso_linking_change_build_fix.patch"
diff --git a/meta/recipes-sato/pimlico/tasks_0.18.bb b/meta/recipes-sato/pimlico/tasks_0.18.bb
index 1282e4f435..fd7edb3d94 100644
--- a/meta/recipes-sato/pimlico/tasks_0.18.bb
+++ b/meta/recipes-sato/pimlico/tasks_0.18.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \
                     file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52"
 
-SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "d40c0227e496b51be6fde10f387215ed"
 SRC_URI[sha256sum] = "08802003da2517c6e0b2defd66bcaf466edd0ce7188373f564d629af6b93cc91"
diff --git a/meta/recipes-sato/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb
index 1ab8cd18cd..8f708bad51 100644
--- a/meta/recipes-sato/pimlico/tasks_git.bb
+++ b/meta/recipes-sato/pimlico/tasks_git.bb
@@ -1,6 +1,6 @@
 require tasks.inc
 
-SRC_URI = "git://git.gnome.org/${PN};protocol=git"
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
 
 PV = "0.13+git${SRCPV}"
 PR = "r1"
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index 4fbf70d85b..e69481de3a 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -2,7 +2,7 @@ require sato-icon-theme.inc
 
 DEPENDS += "icon-naming-utils-native"
 
-SRC_URI = "http://pokylinux.org/releases/sato/${PN}-${PV}.tar.gz \
+SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
            file://iconpath-option.patch"
 
 SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
index f9c4db60d6..2f1b5ba709 100644
--- a/meta/recipes-sato/screenshot/screenshot_svn.bb
+++ b/meta/recipes-sato/screenshot/screenshot_svn.bb
@@ -12,7 +12,7 @@ DEPENDS = "matchbox-panel-2"
 PV = "0.0+svnr${SRCPV}"
 PR = "r2"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
            file://fix_ldadd_order.patch"
 
 S = ${WORKDIR}/${PN}
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb
index bdcdaba009..9dffa837c1 100644
--- a/meta/recipes-sato/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_svn.bb
@@ -6,7 +6,7 @@ PR = "r4"
 
 PV = "0.0+svnr${SRCPV}"
 
-SRC_URI =       "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+SRC_URI =       "svn://svn.o-hand.com/repos/${BPN};module=trunk;proto=http \
                 file://owl-window-menu.patch \
                 "
 
diff --git a/meta/recipes-support/atk/atk_1.32.0.bb b/meta/recipes-support/atk/atk_1.32.0.bb
index f571fa1c9a..e6883ebefa 100644
--- a/meta/recipes-support/atk/atk_1.32.0.bb
+++ b/meta/recipes-support/atk/atk_1.32.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                     file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
 
-SRC_URI = "http://download.gnome.org/sources/atk/1.32/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f"
 SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"
diff --git a/meta/recipes-support/hal/hal-info.inc b/meta/recipes-support/hal/hal-info.inc
index adba83fb28..183dd0ede5 100644
--- a/meta/recipes-support/hal/hal-info.inc
+++ b/meta/recipes-support/hal/hal-info.inc
@@ -6,7 +6,7 @@ SECTION = "unknown"
 LICENSE = "GPLv2 | AFL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ae484909bad0cf11c8e2071cee6bd4dc"
 
-SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"
+SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index e5d559fbbf..6858e82c00 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
 DEPENDS = "flex-native bison-native"
 PR = "r2"
 
-SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \
+SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
           file://fix-makefile.patch \
          "
 
diff --git a/meta/recipes-support/libsoup/libsoup_2.2.100.bb b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
index 7ead09d30e..3704bd4d59 100644
--- a/meta/recipes-support/libsoup/libsoup_2.2.100.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 DEPENDS = "glib-2.0 gnutls libxml2"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/2.2/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "936e29d705aab0483b9a5b8860f68c13"
 SRC_URI[sha256sum] = "fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d"
diff --git a/meta/recipes-support/neon/neon_0.29.5.bb b/meta/recipes-support/neon/neon_0.29.5.bb
index f94cdde634..ae476a6891 100644
--- a/meta/recipes-support/neon/neon_0.29.5.bb
+++ b/meta/recipes-support/neon/neon_0.29.5.bb
@@ -8,7 +8,7 @@ DEPENDS = "zlib libxml2 expat time gnutls"
 
 PR = "r0"
 
-SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
+SRC_URI = "http://www.webdav.org/${BPN}/${P}.tar.gz \
            file://pkgconfig.patch;patch=1"
 
 SRC_URI[md5sum] = "ff369e69ef0f0143beb5626164e87ae2"
diff --git a/meta/recipes-support/taglib/taglib_1.6.3.bb b/meta/recipes-support/taglib/taglib_1.6.3.bb
index 2c9ff12800..f45108b333 100644
--- a/meta/recipes-support/taglib/taglib_1.6.3.bb
+++ b/meta/recipes-support/taglib/taglib_1.6.3.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=db979804f025cf55aabec7129cb671ed \
 
 PR = "r1"
 # http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz
-SRC_URI = "http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.gz \
+SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \
            file://configuretweak.patch;patch=1 \
            file://nolibtool.patch;patch=1"