5 files changed, 9 insertions, 9 deletions

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 45447e3b33..68a2539c6f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -690,7 +690,7 @@ python split_and_strip_files () {
                 debuglibdir = "/usr/lib/debug"
                 debugsrcdir = "/usr/src/debug"
         else:
-                # Original Poky, a.k.a. ".debug", style debug info
+                # Original OE-core, a.k.a. ".debug", style debug info
                 debugappend = ""
                 debugdir = "/.debug"
                 debuglibdir = ""
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index bac9de5ad4..a813c8b59c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -359,7 +359,7 @@ package_install_internal_rpm () {
                 done
         fi
 
-        #### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in Poky..
+        #### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in OE-core..
         # Add any recommended packages to the image
         # RPM does not solve for recommended packages because they are optional...
         # So we query them and tree them like the ATTEMPTONLY packages above...
@@ -720,7 +720,7 @@ python write_specfile () {
                                         splitrobsoletes = dep
 
                 print_deps(splitrdepends,       "Requires", spec_preamble_bottom, d)
-                # Suggests in RPM are like recommends in Poky!
+                # Suggests in RPM are like recommends in OE-core!
                 print_deps(splitrrecommends,    "Suggests", spec_preamble_bottom, d)
                 # While there is no analog for suggests... (So call them recommends for now)
                 print_deps(splitrsuggests,      "Recommends", spec_preamble_bottom, d)
@@ -811,7 +811,7 @@ python write_specfile () {
 
         print_deps(srcdepends,          "BuildRequires", spec_preamble_top, d)
         print_deps(srcrdepends,         "Requires", spec_preamble_top, d)
-        # Suggests in RPM are like recommends in Poky!
+        # Suggests in RPM are like recommends in OE-core!
         print_deps(srcrrecommends,      "Suggests", spec_preamble_top, d)
         # While there is no analog for suggests... (So call them recommends for now)
         print_deps(srcrsuggests,        "Recommends", spec_preamble_top, d)
@@ -960,7 +960,7 @@ python do_package_rpm () {
                 outfile.write("\tprintf \"%s\\n\" ${line}\n")
                 outfile.write("done\n")
 
-        # Poky dependencies a.k.a. RPM requires
+        # OE-core dependencies a.k.a. RPM requires
         outdepends = workdir + "/" + srcname + ".requires"
 
         try:
@@ -974,7 +974,7 @@ python do_package_rpm () {
         dependsfile.close()
         os.chmod(outdepends, 0755)
 
-        # Poky / RPM Provides
+        # OE-core / RPM Provides
         outprovides = workdir + "/" + srcname + ".provides"
 
         try:
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 53584eedf2..a02942875a 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -5,7 +5,7 @@
 SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio"
 
 def raise_sanity_error(msg):
-    bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration.
+    bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
     Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
     Following is the list of potential problems / advisories:
     
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 9c9df6af92..66314a7ba8 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -115,7 +115,7 @@ addtask do_populate_sysroot_setscene
 
 python () {
     if d.getVar('do_stage', True) is not None:
-        bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with Poky" % d.getVar("FILE", True))
+        bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core" % d.getVar("FILE", True))
 }
 
 
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 5cba403dc7..6fc9c1314b 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -34,7 +34,7 @@ toolchain_create_sdk_env_script () {
 }
 
 # This function creates an environment-setup-script in the TMPDIR which enables
-# a Poky IDE to integrate with the build tree
+# a OE-core IDE to integrate with the build tree
 toolchain_create_tree_env_script () {
         script=${TMPDIR}/environment-setup-${MULTIMACH_TARGET_SYS}
         rm -f $script