diff --git a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/wakatime/default.nix
rename to pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/rescript/default.nix
rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix
rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 82087a7d2c2e..a888eb3695f4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -635,7 +635,7 @@ let
         };
       };
 
-      chenglou92.rescript-vscode = callPackage ./rescript { };
+      chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { };
 
       christian-kohler.path-intellisense = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -1416,7 +1416,7 @@ let
         };
       };
 
-      hashicorp.terraform = callPackage ./terraform { };
+      hashicorp.terraform = callPackage ./hashicorp.terraform { };
 
       hookyqr.beautify = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -1930,7 +1930,7 @@ let
 
       ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs
 
-      ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { };
+      ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { };
 
       ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -1944,7 +1944,7 @@ let
         };
       };
 
-      ms-vscode.cpptools = callPackage ./cpptools { };
+      ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { };
 
       ms-vscode.cmake-tools = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -1996,7 +1996,7 @@ let
         };
       };
 
-      ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { };
+      ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { };
 
       ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -2031,7 +2031,7 @@ let
         };
       };
 
-      ms-python.python = callPackage ./python { };
+      ms-python.python = callPackage ./ms-python.python { };
 
       msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -2069,7 +2069,7 @@ let
         };
       };
 
-      ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {};
+      ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {};
 
       ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -2257,7 +2257,7 @@ let
         };
       };
 
-      rust-lang.rust-analyzer = callPackage ./rust-analyzer { };
+      rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { };
       matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher
 
       ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
@@ -2648,7 +2648,7 @@ let
         };
       };
 
-      sumneko.lua = callPackage ./lua { };
+      sumneko.lua = callPackage ./sumneko.lua { };
 
       svelte.svelte-vscode = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -2858,7 +2858,7 @@ let
         };
       };
 
-      vadimcn.vscode-lldb = callPackage ./vscode-lldb { llvmPackages = llvmPackages_14; };
+      vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { llvmPackages = llvmPackages_14; };
 
       valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec {
         mktplcRef = {
@@ -2868,9 +2868,9 @@ let
         };
 
         vsix = fetchurl {
-           name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
-           url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix";
-           sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6";
+          name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
+          url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix";
+          sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6";
         };
 
         nativeBuildInputs = [ jq moreutils ];
@@ -2914,7 +2914,7 @@ let
         };
       };
 
-      ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { };
+      ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { };
 
       vscjava.vscode-java-debug = buildVscodeMarketplaceExtension {
         mktplcRef = {
@@ -3119,7 +3119,7 @@ let
         };
       };
 
-      WakaTime.vscode-wakatime = callPackage ./wakatime { };
+      WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { };
 
       wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension {
         mktplcRef = {
diff --git a/pkgs/applications/editors/vscode/extensions/terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/terraform/default.nix
rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch
rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/python/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/cpptools/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh
rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh
diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json
rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json
diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh
rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix
rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json
rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json
diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix
rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh
rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh
diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/lua/default.nix
rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch b/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch
rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh
similarity index 100%
rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh
rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
index eff075c49398..0eba230ad8e0 100644
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@@ -87,8 +87,8 @@ let
     builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
 
   vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
-   inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
-   vscodeDefault = vscode;
+    inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
+    vscodeDefault = vscode;
   };
 
   vscodeExts2nix = import ./vscodeExts2nix.nix {