diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index eb3efbf5c7..00ce863f03 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1498,7 +1498,7 @@ def yocto_bsp_list(args, scripts_path, properties_file):
 def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
     """
     Return the linux-yocto bsp branch to use with the specified
-    kbranch.  This handles the -standard variants for 3.0 and 3.2; the
+    kbranch.  This handles the -standard variants for 3.2 and 3.4; the
     other variants don't need mappings.
     """
     if need_new_kbranch == "y":
@@ -1507,10 +1507,10 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
         kbranch = existing_kbranch
 
     if (kbranch.startswith("standard/default/common-pc-64") or
-        kbranch.startswith("yocto/standard/common-pc-64")):
+        kbranch.startswith("standard/common-pc-64")):
         return "bsp/common-pc-64/common-pc-64-standard"
     if (kbranch.startswith("standard/default/common-pc") or
-        kbranch.startswith("yocto/standard/common-pc")):
+        kbranch.startswith("standard/common-pc")):
         return "bsp/common-pc/common-pc-standard"
     else:
         return "ktypes/standard"