diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 77f4a30487f18c41df9181645b41e41308e267ad..b5cd9cd41e7fe74efba44c0cda9430cb82e67982 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -236,7 +236,7 @@ public abstract class Slave extends Node implements Serializable {
     public FilePath getWorkspaceFor(TopLevelItem item) {
         FilePath r = getWorkspaceRoot();
         if(r==null)     return null;    // offline
-        return r.child(item.getName());
+        return r.child(item.getFullName());
     }
 
     public FilePath getRootPath() {
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index f1612353ad78a76b8048ec24cbe578ec89206f3d..7d6d096a21bea9a47f823b372d8063bb56a0151a 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -628,6 +628,11 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
                 throw new IllegalStateException("second instance");
             theInstance = this;
 
+            if (!new File(root,"jobs").exists()) {
+                // if this is a fresh install, use more modern default layout that's consistent with slaves
+                workspaceDir = "${JENKINS_HOME}/workspace/${ITEM_FULLNAME}";
+            }
+
             // doing this early allows InitStrategy to set environment upfront
             final InitStrategy is = InitStrategy.get(Thread.currentThread().getContextClassLoader());