diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.91.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.91.bb
index 8806946a59..9d2da8d087 100644
--- a/meta-oe/recipes-connectivity/bluez/bluez4_4.91.bb
+++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.91.bb
@@ -16,7 +16,7 @@ ASNEEDED = ""
 PR = "r9"
 
 # to find bluez patches from oe-core
-FILESPATH =. "${POKYBASE}/meta/recipes-connectivity/bluez/bluez4-4.82/:"
+FILESPATH =. "${COREBASE}/meta/recipes-connectivity/bluez/bluez4-4.82/:"
 SRC_URI = "\
   ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
   file://fix-dfutool-usb-declaration-mismatch.patch \
diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb
index 1961752d4f..a25ef8f70c 100644
--- a/meta-oe/recipes-core/meta/distro-feed-configs.bb
+++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 PR = "r1"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 DISTRO_FEED_PREFIX ?= "remote"
 DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/tasks/task-boot.bb
index 8f897a34b9..3b84d6a81b 100644
--- a/meta-oe/recipes-core/tasks/task-boot.bb
+++ b/meta-oe/recipes-core/tasks/task-boot.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Basic task to get a device booting"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 PR = "r53"
 
diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/tasks/task-cli-tools.bb
index 808d9538c9..c6dc4a7c99 100644
--- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
+++ b/meta-oe/recipes-core/tasks/task-cli-tools.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of useful command line tools"
 DESCRIPTION_${PN}-debug = "A set of command line tools useful for debugging"
 SECTION = "console"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
 PR = "r18"
 
diff --git a/meta-oe/recipes-core/tasks/task-x11.bb b/meta-oe/recipes-core/tasks/task-x11.bb
index aa10061285..66af8bdf52 100644
--- a/meta-oe/recipes-core/tasks/task-x11.bb
+++ b/meta-oe/recipes-core/tasks/task-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer."
 SECTION = "x11/server"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
 PR = "r7"
 
diff --git a/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb b/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb
index fac712395d..2ca2dada1e 100644
--- a/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb
+++ b/meta-oe/recipes-gnome/gnome/gconf-native_2.6.1.bb
@@ -2,7 +2,7 @@ NOTE = "This is just a dummy package to get packages stop complaining about gcon
         which they are not using anyway... :D"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 PR = "r1"
 
diff --git a/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb b/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb
index 4a4c714ecb..d82aec5e6f 100644
--- a/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb
+++ b/meta-oe/recipes-graphics/font-update-common/font-update-common_0.1.bb
@@ -3,7 +3,7 @@ to make them known to the WM, whether X11 or Opie"
 AUTHOR = "Rolf Leggewie <oe-devel@rolf.leggewie.biz"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 SRC_URI = "file://update-fonts"
 
diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
index 4a3001db80..9c2a0f9bd6 100644
--- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Install one of these tasks to get support for truetype fonts."
 SECTION = "fonts"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
 PR = "r0"
 
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
index 4526cbb817..10360f72f7 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data from xinput-calibrator"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SECTION = "base"
 
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
index c20b8e9207..66505bd311 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Machine specific xorg.conf files"
 PR = "r43"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://xorg.conf"
 
diff --git a/meta-oe/recipes-qt/tasks/task-poky-qt.bb b/meta-oe/recipes-qt/tasks/task-poky-qt.bb
index da960db5b0..762dff8e3e 100644
--- a/meta-oe/recipes-qt/tasks/task-poky-qt.bb
+++ b/meta-oe/recipes-qt/tasks/task-poky-qt.bb
@@ -4,8 +4,8 @@
 
 DESCRIPTION = "Qt Tasks for Poky"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r3"
 
 PACKAGES = "\
diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb
index 29a191d2af..cf4089f633 100644
--- a/meta-oe/recipes-support/fbset/fbset-modes.bb
+++ b/meta-oe/recipes-support/fbset/fbset-modes.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 PV = "0.1.0"
 PR = "r5"