diff --git a/releng/org.yocto.sdk.releng/eclipse-yocto.target b/releng/org.yocto.sdk.releng/eclipse-yocto.target
index dd7cc5a..da95f30 100644
--- a/releng/org.yocto.sdk.releng/eclipse-yocto.target
+++ b/releng/org.yocto.sdk.releng/eclipse-yocto.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Poky w/o RSE" sequenceNumber="34">
+<?pde version="3.8"?><target name="Eclipse Yocto" sequenceNumber="34">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/releng/org.yocto.sdk.releng/launches/eclipse-yocto.launch b/releng/org.yocto.sdk.releng/launches/eclipse-yocto.launch
index fc0c77e..d47f995 100644
--- a/releng/org.yocto.sdk.releng/launches/eclipse-yocto.launch
+++ b/releng/org.yocto.sdk.releng/launches/eclipse-yocto.launch
@@ -9,13 +9,13 @@
 <booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="clearws" value="true"/>
 <booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/poky"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/eclipse-yocto"/>
 <booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-poky"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-eclipse-yocto"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -perspective org.eclipse.cdt.ui.CPerspective"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
diff --git a/releng/org.yocto.sdk.releng/projectsets/eclipse-yocto.psf b/releng/org.yocto.sdk.releng/projectsets/eclipse-yocto.psf
index 87e9341..dd335b0 100644
--- a/releng/org.yocto.sdk.releng/projectsets/eclipse-yocto.psf
+++ b/releng/org.yocto.sdk.releng/projectsets/eclipse-yocto.psf
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <psf version="2.0">
 <provider id="org.eclipse.egit.core.GitProvider">
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,plugins/org.yocto.cmake.managedbuilder"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,features/org.yocto.doc"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,plugins/org.yocto.doc.user"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,features/org.yocto.sdk"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,plugins/org.yocto.sdk.ide"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,plugins/org.yocto.sdk.ide.doc.user"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,features/org.yocto.utils"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,releng/org.yocto.sdk.releng"/>
-<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-contrib,master,."/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,plugins/org.yocto.cmake.managedbuilder"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,features/org.yocto.doc"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,plugins/org.yocto.doc.user"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,features/org.yocto.sdk"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,plugins/org.yocto.sdk.ide"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,plugins/org.yocto.sdk.ide.doc.user"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,features/org.yocto.utils"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,releng/org.yocto.sdk.releng"/>
+<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-yocto-contrib,master,."/>
 </provider>
-<workingSets editPageId="org.eclipse.ui.resourceWorkingSetPage" id="1515432086327_1" label="poky-parent" name="poky-parent">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/poky-parent" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/poky" type="4"/>
+<workingSets editPageId="org.eclipse.ui.resourceWorkingSetPage" id="1515432086327_1" label="eclipse-yocto-parent" name="eclipse-yocto-parent">
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/eclipse-yocto-parent" type="4"/>
+<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/eclipse-yocto" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.yocto.sdk.ide" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.yocto.sdk.ide.doc.user" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.yocto.cmake.managedbuilder" type="4"/>
@@ -22,4 +22,4 @@
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.yocto.utils" type="4"/>
 <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.yocto.doc" type="4"/>
 </workingSets>
-</psf>
\ No newline at end of file
+</psf>