diff --git a/toolchains/gcc-11.3.0/compiler_vars.sh b/toolchains/gcc-11_3_0-openmpi-4_1_4-cuda-11_4/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-11.3.0/compiler_vars.sh
rename to toolchains/gcc-11_3_0-openmpi-4_1_4-cuda-11_4/compiler_vars.sh
diff --git a/toolchains/gcc-11.3.0_openmpi-4.1.4_cuda-11.4/spack.yaml b/toolchains/gcc-11_3_0-openmpi-4_1_4-cuda-11_4/spack.yaml
similarity index 100%
rename from toolchains/gcc-11.3.0_openmpi-4.1.4_cuda-11.4/spack.yaml
rename to toolchains/gcc-11_3_0-openmpi-4_1_4-cuda-11_4/spack.yaml
diff --git a/toolchains/gcc-11.3.0_openmpi-4.1.4/compiler_vars.sh b/toolchains/gcc-11_3_0-openmpi-4_1_4/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-11.3.0_openmpi-4.1.4/compiler_vars.sh
rename to toolchains/gcc-11_3_0-openmpi-4_1_4/compiler_vars.sh
diff --git a/toolchains/gcc-11.3.0_openmpi-4.1.4/spack.yaml b/toolchains/gcc-11_3_0-openmpi-4_1_4/spack.yaml
similarity index 100%
rename from toolchains/gcc-11.3.0_openmpi-4.1.4/spack.yaml
rename to toolchains/gcc-11_3_0-openmpi-4_1_4/spack.yaml
diff --git a/toolchains/gcc-11.3.0_openmpi-4.1.4_cuda-11.4/compiler_vars.sh b/toolchains/gcc-11_3_0/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-11.3.0_openmpi-4.1.4_cuda-11.4/compiler_vars.sh
rename to toolchains/gcc-11_3_0/compiler_vars.sh
diff --git a/toolchains/gcc-11.3.0/spack.yaml b/toolchains/gcc-11_3_0/spack.yaml
similarity index 100%
rename from toolchains/gcc-11.3.0/spack.yaml
rename to toolchains/gcc-11_3_0/spack.yaml
diff --git a/toolchains/gcc-12.2.0/compiler_vars.sh b/toolchains/gcc-12_2_0-openmpi-4_1_4/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-12.2.0/compiler_vars.sh
rename to toolchains/gcc-12_2_0-openmpi-4_1_4/compiler_vars.sh
diff --git a/toolchains/gcc-12.2.0_openmpi-4.1.4/spack.yaml b/toolchains/gcc-12_2_0-openmpi-4_1_4/spack.yaml
similarity index 100%
rename from toolchains/gcc-12.2.0_openmpi-4.1.4/spack.yaml
rename to toolchains/gcc-12_2_0-openmpi-4_1_4/spack.yaml
diff --git a/toolchains/gcc-12.2.0_openmpi-4.1.4/compiler_vars.sh b/toolchains/gcc-12_2_0/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-12.2.0_openmpi-4.1.4/compiler_vars.sh
rename to toolchains/gcc-12_2_0/compiler_vars.sh
diff --git a/toolchains/gcc-12.2.0/spack.yaml b/toolchains/gcc-12_2_0/spack.yaml
similarity index 100%
rename from toolchains/gcc-12.2.0/spack.yaml
rename to toolchains/gcc-12_2_0/spack.yaml
diff --git a/toolchains/gcc-12.3.0/compiler_vars.sh b/toolchains/gcc-12_3_0-openmpi-4_1_5/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-12.3.0/compiler_vars.sh
rename to toolchains/gcc-12_3_0-openmpi-4_1_5/compiler_vars.sh
diff --git a/toolchains/gcc-12.3.0_openmpi-4.1.5/spack.yaml b/toolchains/gcc-12_3_0-openmpi-4_1_5/spack.yaml
similarity index 100%
rename from toolchains/gcc-12.3.0_openmpi-4.1.5/spack.yaml
rename to toolchains/gcc-12_3_0-openmpi-4_1_5/spack.yaml
diff --git a/toolchains/gcc-12.3.0_openmpi-4.1.5/compiler_vars.sh b/toolchains/gcc-12_3_0/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-12.3.0_openmpi-4.1.5/compiler_vars.sh
rename to toolchains/gcc-12_3_0/compiler_vars.sh
diff --git a/toolchains/gcc-12.3.0/spack.yaml b/toolchains/gcc-12_3_0/spack.yaml
similarity index 100%
rename from toolchains/gcc-12.3.0/spack.yaml
rename to toolchains/gcc-12_3_0/spack.yaml
diff --git a/toolchains/gcc-13.2.0/compiler_vars.sh b/toolchains/gcc-13_2_0-openmpi-4_1_6/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-13.2.0/compiler_vars.sh
rename to toolchains/gcc-13_2_0-openmpi-4_1_6/compiler_vars.sh
diff --git a/toolchains/gcc-13.2.0_openmpi-4.1.6/spack.yaml b/toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml
similarity index 100%
rename from toolchains/gcc-13.2.0_openmpi-4.1.6/spack.yaml
rename to toolchains/gcc-13_2_0-openmpi-4_1_6/spack.yaml
diff --git a/toolchains/gcc-13.2.0_openmpi-4.1.6/compiler_vars.sh b/toolchains/gcc-13_2_0/compiler_vars.sh
similarity index 100%
rename from toolchains/gcc-13.2.0_openmpi-4.1.6/compiler_vars.sh
rename to toolchains/gcc-13_2_0/compiler_vars.sh
diff --git a/toolchains/gcc-13.2.0/spack.yaml b/toolchains/gcc-13_2_0/spack.yaml
similarity index 100%
rename from toolchains/gcc-13.2.0/spack.yaml
rename to toolchains/gcc-13_2_0/spack.yaml
diff --git a/toolchains/intel-2021.10.0/compiler_vars.sh b/toolchains/intel-2021_10_0-impi-2021_10_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.10.0/compiler_vars.sh
rename to toolchains/intel-2021_10_0-impi-2021_10_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.10.0_impi-2021.10.0/spack.yaml b/toolchains/intel-2021_10_0-impi-2021_10_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.10.0_impi-2021.10.0/spack.yaml
rename to toolchains/intel-2021_10_0-impi-2021_10_0/spack.yaml
diff --git a/toolchains/intel-2021.10.0_impi-2021.10.0/compiler_vars.sh b/toolchains/intel-2021_10_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.10.0_impi-2021.10.0/compiler_vars.sh
rename to toolchains/intel-2021_10_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.10.0/spack.yaml b/toolchains/intel-2021_10_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.10.0/spack.yaml
rename to toolchains/intel-2021_10_0/spack.yaml
diff --git a/toolchains/intel-2021.6.0/compiler_vars.sh b/toolchains/intel-2021_6_0-impi-2021_6_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.6.0/compiler_vars.sh
rename to toolchains/intel-2021_6_0-impi-2021_6_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.6.0_impi-2021.6.0/spack.yaml b/toolchains/intel-2021_6_0-impi-2021_6_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.6.0_impi-2021.6.0/spack.yaml
rename to toolchains/intel-2021_6_0-impi-2021_6_0/spack.yaml
diff --git a/toolchains/intel-2021.6.0_impi-2021.6.0/compiler_vars.sh b/toolchains/intel-2021_6_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.6.0_impi-2021.6.0/compiler_vars.sh
rename to toolchains/intel-2021_6_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.6.0/spack.yaml b/toolchains/intel-2021_6_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.6.0/spack.yaml
rename to toolchains/intel-2021_6_0/spack.yaml
diff --git a/toolchains/intel-2021.7.1/compiler_vars.sh b/toolchains/intel-2021_7_1-impi-2021_7_1/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.7.1/compiler_vars.sh
rename to toolchains/intel-2021_7_1-impi-2021_7_1/compiler_vars.sh
diff --git a/toolchains/intel-2021.7.1_impi-2021.7.1/spack.yaml b/toolchains/intel-2021_7_1-impi-2021_7_1/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.7.1_impi-2021.7.1/spack.yaml
rename to toolchains/intel-2021_7_1-impi-2021_7_1/spack.yaml
diff --git a/toolchains/intel-2021.7.1_impi-2021.7.1/compiler_vars.sh b/toolchains/intel-2021_7_1/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.7.1_impi-2021.7.1/compiler_vars.sh
rename to toolchains/intel-2021_7_1/compiler_vars.sh
diff --git a/toolchains/intel-2021.7.1/spack.yaml b/toolchains/intel-2021_7_1/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.7.1/spack.yaml
rename to toolchains/intel-2021_7_1/spack.yaml
diff --git a/toolchains/intel-2021.9.0/compiler_vars.sh b/toolchains/intel-2021_9_0-impi-2021_9_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.9.0/compiler_vars.sh
rename to toolchains/intel-2021_9_0-impi-2021_9_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.9.0_impi-2021.9.0/spack.yaml b/toolchains/intel-2021_9_0-impi-2021_9_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.9.0_impi-2021.9.0/spack.yaml
rename to toolchains/intel-2021_9_0-impi-2021_9_0/spack.yaml
diff --git a/toolchains/intel-2021.9.0_impi-2021.9.0/compiler_vars.sh b/toolchains/intel-2021_9_0/compiler_vars.sh
similarity index 100%
rename from toolchains/intel-2021.9.0_impi-2021.9.0/compiler_vars.sh
rename to toolchains/intel-2021_9_0/compiler_vars.sh
diff --git a/toolchains/intel-2021.9.0/spack.yaml b/toolchains/intel-2021_9_0/spack.yaml
similarity index 100%
rename from toolchains/intel-2021.9.0/spack.yaml
rename to toolchains/intel-2021_9_0/spack.yaml