diff --git a/CMakeLists.txt b/CMakeLists.txt
index d80440fc..30d17263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,9 +166,9 @@ message("Configure kernels: ...")
 configure_kernel("/share/jupyter/kernels/xcpp11/")
 configure_kernel("/share/jupyter/kernels/xcpp14/")
 configure_kernel("/share/jupyter/kernels/xcpp17/")
-configure_kernel("/share/jupyter/kernels/xcpp17omp/")
+configure_kernel("/share/jupyter/kernels/xcpp17-omp/")
 configure_kernel("/share/jupyter/kernels/xcpp20/")
-configure_kernel("/share/jupyter/kernels/xcpp20omp/")
+configure_kernel("/share/jupyter/kernels/xcpp20-omp/")
 
 # Source files
 # ============
diff --git a/share/jupyter/kernels/xcpp11/kernel.json.in b/share/jupyter/kernels/xcpp11/kernel.json.in
index 1f4f73a6..05ac80b5 100644
--- a/share/jupyter/kernels/xcpp11/kernel.json.in
+++ b/share/jupyter/kernels/xcpp11/kernel.json.in
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",
-      "-std=c++11"@XEUS_CPP_OMP@
+      "-std=c++11","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false}
diff --git a/share/jupyter/kernels/xcpp14/kernel.json.in b/share/jupyter/kernels/xcpp14/kernel.json.in
index b6718dcf..35d7ce2a 100644
--- a/share/jupyter/kernels/xcpp14/kernel.json.in
+++ b/share/jupyter/kernels/xcpp14/kernel.json.in
@@ -13,7 +13,7 @@
       "-std=c++14",
       "-fno-exceptions",
       "-O2",
-      "-v"@XEUS_CPP_OMP@
+      "-v","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false}
diff --git a/share/jupyter/kernels/xcpp17omp/kernel.json.in b/share/jupyter/kernels/xcpp17-omp/kernel.json.in
similarity index 91%
rename from share/jupyter/kernels/xcpp17omp/kernel.json.in
rename to share/jupyter/kernels/xcpp17-omp/kernel.json.in
index f74379f1..c3215c94 100644
--- a/share/jupyter/kernels/xcpp17omp/kernel.json.in
+++ b/share/jupyter/kernels/xcpp17-omp/kernel.json.in
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",
-      "-std=c++17"@XEUS_CPP_OMP@
+      "-std=c++17","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false
diff --git a/share/jupyter/kernels/xcpp17omp/logo-32x32.png b/share/jupyter/kernels/xcpp17-omp/logo-32x32.png
similarity index 100%
rename from share/jupyter/kernels/xcpp17omp/logo-32x32.png
rename to share/jupyter/kernels/xcpp17-omp/logo-32x32.png
diff --git a/share/jupyter/kernels/xcpp17omp/logo-64x64.png b/share/jupyter/kernels/xcpp17-omp/logo-64x64.png
similarity index 100%
rename from share/jupyter/kernels/xcpp17omp/logo-64x64.png
rename to share/jupyter/kernels/xcpp17-omp/logo-64x64.png
diff --git a/share/jupyter/kernels/xcpp17omp/logo-svg.svg b/share/jupyter/kernels/xcpp17-omp/logo-svg.svg
similarity index 100%
rename from share/jupyter/kernels/xcpp17omp/logo-svg.svg
rename to share/jupyter/kernels/xcpp17-omp/logo-svg.svg
diff --git a/share/jupyter/kernels/xcpp17/kernel.json.in b/share/jupyter/kernels/xcpp17/kernel.json.in
index ea76e2d9..efda6c85 100644
--- a/share/jupyter/kernels/xcpp17/kernel.json.in
+++ b/share/jupyter/kernels/xcpp17/kernel.json.in
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",
-      "-std=c++17"@XEUS_CPP_OMP@
+      "-std=c++17","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false
diff --git a/share/jupyter/kernels/xcpp20omp/kernel.json.in b/share/jupyter/kernels/xcpp20-omp/kernel.json.in
similarity index 91%
rename from share/jupyter/kernels/xcpp20omp/kernel.json.in
rename to share/jupyter/kernels/xcpp20-omp/kernel.json.in
index 1dec7fcc..8902b0a2 100644
--- a/share/jupyter/kernels/xcpp20omp/kernel.json.in
+++ b/share/jupyter/kernels/xcpp20-omp/kernel.json.in
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",
-      "-std=c++20"@XEUS_CPP_OMP@
+      "-std=c++20","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false
diff --git a/share/jupyter/kernels/xcpp20omp/logo-32x32.png b/share/jupyter/kernels/xcpp20-omp/logo-32x32.png
similarity index 100%
rename from share/jupyter/kernels/xcpp20omp/logo-32x32.png
rename to share/jupyter/kernels/xcpp20-omp/logo-32x32.png
diff --git a/share/jupyter/kernels/xcpp20omp/logo-64x64.png b/share/jupyter/kernels/xcpp20-omp/logo-64x64.png
similarity index 100%
rename from share/jupyter/kernels/xcpp20omp/logo-64x64.png
rename to share/jupyter/kernels/xcpp20-omp/logo-64x64.png
diff --git a/share/jupyter/kernels/xcpp20omp/logo-svg.svg b/share/jupyter/kernels/xcpp20-omp/logo-svg.svg
similarity index 100%
rename from share/jupyter/kernels/xcpp20omp/logo-svg.svg
rename to share/jupyter/kernels/xcpp20-omp/logo-svg.svg
diff --git a/share/jupyter/kernels/xcpp20/kernel.json.in b/share/jupyter/kernels/xcpp20/kernel.json.in
index 3736754f..509e0326 100644
--- a/share/jupyter/kernels/xcpp20/kernel.json.in
+++ b/share/jupyter/kernels/xcpp20/kernel.json.in
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@XEUS_CPP_INCLUDE_DIR@",
-      "-std=c++20"@XEUS_CPP_OMP@
+      "-std=c++20","@XEUS_CPP_OMP@"
   ],
   "language": "cpp",
   "metadata": {"debugger": false