4 files changed, 3 insertions, 6 deletions
diff --git a/armv7-versatile-base-system.morph b/base-system-armv7-versatile.morph
index 2bc95c4d..bcd8b02c 100644
--- a/armv7-versatile-base-system.morph
+++ b/base-system-armv7-versatile.morph
@@ -1,5 +1,5 @@
 {
-    "name": "arm-versatile-base-system",
+    "name": "base-system-armv7-versatile",
     "description": "The set of strata required to have a minimal system for an ARM versatile system.",
     "kind": "system",
     "system-kind": "rootfs-tarball",
diff --git a/x86_64-generic-base-system.morph b/base-system-x86_64-generic.morph
index 3e6b4e9c..4c5c6f9d 100644
--- a/x86_64-generic-base-system.morph
+++ b/base-system-x86_64-generic.morph
@@ -1,5 +1,5 @@
 {
-    "name": "x86_64-generic-base-system",
+    "name": "base-system-x86_64-generic",
     "description": "The set of strata required to have a minimal system for a 64-bit x86 system.",
     "kind": "system",
     "system-kind": "syslinux-disk",
@@ -16,8 +16,5 @@
             "repo": "baserock:morphs",
             "ref": "master"
         }
-    ],
-    "test-stories": [
-        "stories/login.py"
     ]
 }
diff --git a/armv7-versatile-devel-system.morph b/devel-system-armv7-versatile.morph
index 1a092d4c..1a092d4c 100644
--- a/armv7-versatile-devel-system.morph
+++ b/devel-system-armv7-versatile.morph
diff --git a/x86_64-generic-devel-system.morph b/devel-system-x86_64-generic.morph
index 8ec47137..09b322c2 100644
--- a/x86_64-generic-devel-system.morph
+++ b/devel-system-x86_64-generic.morph
@@ -1,5 +1,5 @@
 {
-    "name": "x86_64-generic-devel-system",
+    "name": "devel-system-x86_64-generic",
     "description": "A system that is able to build other systems based on the 64-bit x86 architecture.",
     "kind": "system",
     "system-kind": "syslinux-disk",