diff --git a/classes/external-toolchain-cross-canadian.bbclass b/classes/external-toolchain-cross-canadian.bbclass
index afdd0a0..3adedcf 100644
--- a/classes/external-toolchain-cross-canadian.bbclass
+++ b/classes/external-toolchain-cross-canadian.bbclass
@@ -7,8 +7,7 @@ STRIP_task-populate-sysroot = "strip"
 OBJCOPY_task-package = "objcopy"
 PACKAGE_DEPENDS_remove = "virtual/${TARGET_PREFIX}binutils"
 
-PN .= "-${TRANSLATED_TARGET_ARCH}"
-
+# Scan just toolchains root directory, but include some additional mirrors
 EXTERNAL_INSTALL_SOURCE_PATHS = "${EXTERNAL_TOOLCHAIN}"
 FILES_MIRRORS += "\
     ${bindir}/|/bin/\n \
diff --git a/recipes-external/binutils/binutils-external-cross-canadian.bb b/recipes-external/binutils/binutils-external-cross-canadian.bb
index be30639..860710b 100644
--- a/recipes-external/binutils/binutils-external-cross-canadian.bb
+++ b/recipes-external/binutils/binutils-external-cross-canadian.bb
@@ -1,6 +1,8 @@
 require recipes-external/binutils/binutils-external.inc
 inherit external-toolchain-cross-canadian
 
+PN .= "-${TRANSLATED_TARGET_ARCH}"
+
 FILES_${PN} = "\
     ${@' '.join('${bindir}/${EXTERNAL_TARGET_SYS}-' + i for i in '${binutils_binaries}'.split())} \
     ${@' '.join('${exec_prefix}/${EXTERNAL_TARGET_SYS}/bin/' + i for i in '${binutils_binaries}'.split())} \
diff --git a/recipes-external/gcc/gcc-external-cross-canadian.bb b/recipes-external/gcc/gcc-external-cross-canadian.bb
index 86c716e..cbddf29 100644
--- a/recipes-external/gcc/gcc-external-cross-canadian.bb
+++ b/recipes-external/gcc/gcc-external-cross-canadian.bb
@@ -1,6 +1,8 @@
 require recipes-external/gcc/gcc-external.inc
 inherit external-toolchain-cross-canadian
 
+PN .= "-${TRANSLATED_TARGET_ARCH}"
+
 BINV = "${GCC_VERSION}"
 
 RDEPENDS_${PN} = "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}"
diff --git a/recipes-external/gdb/gdb-external-cross-canadian.bb b/recipes-external/gdb/gdb-external-cross-canadian.bb
index cd10b23..cf92518 100644
--- a/recipes-external/gdb/gdb-external-cross-canadian.bb
+++ b/recipes-external/gdb/gdb-external-cross-canadian.bb
@@ -1,6 +1,8 @@
 require recipes-external/gdb/gdb-external.inc
 inherit external-toolchain-cross-canadian
 
+PN .= "-${TRANSLATED_TARGET_ARCH}"
+
 FILES_MIRRORS =. "\
     ${exec_prefix}|${target_exec_prefix}/${EXTERNAL_TARGET_SYS}\n \
 "