diff --git a/build.ps1 b/build.ps1
index d30235c..2b43d46 100644
--- a/build.ps1
+++ b/build.ps1
@@ -10,9 +10,9 @@ function Format-SpecName {
     )
     return @(
         $prefix,
-        (& { if ($theme) { $theme } else { "" } }),
-        $Kind
-    ).Where({ $_ -ne "" }) -Join "_"
+        $Kind,
+        (& { if ($theme) { $theme } else { "" } })
+    ).Where({ $_ -ne "" }) -Join "-"
 }
 
 function Compress-Builds {
diff --git a/scripts.py b/scripts.py
index e064270..6879038 100644
--- a/scripts.py
+++ b/scripts.py
@@ -5,7 +5,7 @@ from pathlib import Path
 
 def build_sunvalley():
     buildscript = Path.cwd() / 'build.ps1'
-    subprocess.run(['powershell', str(buildscript), 'sv'])
+    subprocess.run(['powershell', str(buildscript), 'sunvalley'])
 
 
 def build_forest():
@@ -14,7 +14,7 @@ def build_forest():
 
     buildscript = Path.cwd() / 'build.ps1'
     for theme in ('light', 'dark'):
-        subprocess.run(['powershell', str(buildscript), 'fst', theme])
+        subprocess.run(['powershell', str(buildscript), 'forest', theme])
 
     subprocess.run([sys.executable, str(rewriter), '--restore'])