diff --git a/.github/workflows/build_all_keyboards.yml b/.github/workflows/build-all-default.yml
similarity index 98%
rename from .github/workflows/build_all_keyboards.yml
rename to .github/workflows/build-all-default.yml
index 3c94c19..1b858b4 100644
--- a/.github/workflows/build_all_keyboards.yml
+++ b/.github/workflows/build-all-default.yml
@@ -1,4 +1,4 @@
-name: 'Build all keyboards'
+name: 'Build all keyboards with default options'
 on:
   - workflow_dispatch
 jobs:
diff --git a/.github/workflows/build_corne_with_all_options.yml b/.github/workflows/build-corne-all.yml
similarity index 100%
rename from .github/workflows/build_corne_with_all_options.yml
rename to .github/workflows/build-corne-all.yml
diff --git a/.github/workflows/build_corne.yml b/.github/workflows/build-corne-default.yml
similarity index 98%
rename from .github/workflows/build_corne.yml
rename to .github/workflows/build-corne-default.yml
index 8c8f390..68308ad 100644
--- a/.github/workflows/build_corne.yml
+++ b/.github/workflows/build-corne-default.yml
@@ -1,4 +1,4 @@
-name: 'Build corne'
+name: 'Build corne with default options'
 on:
   - push
   - pull_request
diff --git a/.github/workflows/build_corne-ish_zen_with_all_options.yml b/.github/workflows/build-corneishzen-all.yml
similarity index 96%
rename from .github/workflows/build_corne-ish_zen_with_all_options.yml
rename to .github/workflows/build-corneishzen-all.yml
index 14529df..62ae234 100644
--- a/.github/workflows/build_corne-ish_zen_with_all_options.yml
+++ b/.github/workflows/build-corneishzen-all.yml
@@ -86,7 +86,7 @@ jobs:
           done
           artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
           echo "::set-output name=artifact-build-name::$artifact_build_name"
-          echo "::set-output name=artifact-generic-name::"`echo "$artifact_build_name" | sed 's/_\(left\|right\)//'`
+          echo "::set-output name=artifact-generic-name::$artifact_build_name"
           echo "::set-output name=artifact-dir::artifacts"
       - name: Build (west build)
         run: west build -s zmk/app -b ${{ matrix.board }} -- ${{ steps.variables.outputs.shield-arg }} -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"