4 files changed, 7 insertions, 7 deletions

diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index e71a1c6..0b56d53 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -48,7 +48,7 @@ for DIR in $(ls -d build-*); do
     bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk
     if [ $? = 0 ]; then
         if [ -n "${UPLOAD}" ]; then
-            ../sources/meta-b2qt/scripts/upload.sh
+            ../sources/meta-boot2qt/scripts/upload.sh
         fi
     else
         echo "    build failed" >> ../build.log
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 864ef05..bb86dd7 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 390486a..3555b7c 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3e35ad8..f370032 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -99,18 +99,18 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-qt5 ]; then
     sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
   fi
 
-  if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
-    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../)
+  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
+    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available