diff --git a/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml b/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
index a8b6dd81d6be..6f7a86ddde56 100644
--- a/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
+++ b/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.vcs.git.frontend">
+<idea-plugin>
   <resource-bundle>messages.GitFrontendBundle</resource-bundle>
 
   <dependencies>
diff --git a/plugins/git4idea/gen/git4idea/GitIcons.java b/plugins/git4idea/gen/com/intellij/vcs/git/icons/GitIcons.java
similarity index 87%
rename from plugins/git4idea/gen/git4idea/GitIcons.java
rename to plugins/git4idea/gen/com/intellij/vcs/git/icons/GitIcons.java
index dcf781682647..01fbe7ce4b6d 100644
--- a/plugins/git4idea/gen/git4idea/GitIcons.java
+++ b/plugins/git4idea/gen/com/intellij/vcs/git/icons/GitIcons.java
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package git4idea;
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.vcs.git.icons;
 
 import com.intellij.ui.IconManager;
 import org.jetbrains.annotations.NotNull;
diff --git a/plugins/git4idea/intellij.vcs.git.coverage/resources/intellij.vcs.git.coverage.xml b/plugins/git4idea/intellij.vcs.git.coverage/resources/intellij.vcs.git.coverage.xml
index d73b7ee67cb3..0699880421bb 100644
--- a/plugins/git4idea/intellij.vcs.git.coverage/resources/intellij.vcs.git.coverage.xml
+++ b/plugins/git4idea/intellij.vcs.git.coverage/resources/intellij.vcs.git.coverage.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="com.intellij.vcs.git.coverage">
+<idea-plugin>
   <dependencies>
     <module name="intellij.platform.vcs.log"/>
     <module name="intellij.platform.vcs.log.graph.impl"/>
diff --git a/plugins/git4idea/plugin-content.yaml b/plugins/git4idea/plugin-content.yaml
index 776f5be308ee..e26a39c7fa85 100644
--- a/plugins/git4idea/plugin-content.yaml
+++ b/plugins/git4idea/plugin-content.yaml
@@ -1,6 +1,9 @@
 - name: lib/git4idea-rt.jar
   modules:
   - name: intellij.vcs.git.rt
+- name: lib/modules/intellij.vcs.git.coverage.jar
+  contentModules:
+  - name: intellij.vcs.git.coverage
 - name: lib/modules/intellij.vcs.git.frontend.jar
   contentModules:
   - name: intellij.vcs.git.frontend
@@ -9,6 +12,4 @@
   - name: intellij.vcs.git.shared
 - name: lib/vcs-git.jar
   modules:
-  - name: intellij.vcs.git
-  contentModules:
-  - name: intellij.vcs.git.coverage
\ No newline at end of file
+  - name: intellij.vcs.git
\ No newline at end of file
diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml
index 867f0eff5ac4..2eec236ea8d4 100644
--- a/plugins/git4idea/resources/META-INF/plugin.xml
+++ b/plugins/git4idea/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="git4idea" xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
   <name>Git</name>
   <id>Git4Idea</id>
   <category>Version Controls</category>
diff --git a/plugins/git4idea/resources/intellij.vcs.git.terminal.xml b/plugins/git4idea/resources/intellij.vcs.git.terminal.xml
index c9c78510aa1b..42ab406df20c 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.terminal.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.terminal.xml
@@ -1,4 +1,4 @@
-<idea-plugin package="git4idea.terminal">
+<idea-plugin>
   <dependencies>
     <plugin id="org.jetbrains.plugins.terminal"/>
   </dependencies>
diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml
index 69aa84762dd3..d9dc95e90a2a 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.xml
@@ -1,5 +1,5 @@
 <!-- todo: register this as a content module (IJPL-210868); currently it's included via 'xi:include' tag -->
-<idea-plugin package="git4idea">
+<idea-plugin>
   <resource-bundle>messages.GitBundle</resource-bundle>
 
   <dependencies>
diff --git a/plugins/git4idea/src/git4idea/log/GitCommitSignatureStatusProvider.kt b/plugins/git4idea/src/git4idea/log/GitCommitSignatureStatusProvider.kt
index de713e8a12e1..a40ae9e1b848 100644
--- a/plugins/git4idea/src/git4idea/log/GitCommitSignatureStatusProvider.kt
+++ b/plugins/git4idea/src/git4idea/log/GitCommitSignatureStatusProvider.kt
@@ -11,11 +11,11 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.ColorUtil
 import com.intellij.util.ui.EmptyIcon
 import com.intellij.util.ui.UIUtil
+import com.intellij.vcs.git.icons.GitIcons
 import com.intellij.vcs.log.data.util.VcsCommitsDataLoader
 import com.intellij.vcs.log.ui.frame.VcsCommitExternalStatusPresentation
 import com.intellij.vcs.log.ui.frame.VcsCommitExternalStatusProvider
 import com.intellij.vcs.log.ui.table.column.util.VcsLogExternalStatusColumnService
-import git4idea.GitIcons
 import git4idea.commit.signature.GitCommitSignature
 import git4idea.i18n.GitBundle
 import git4idea.repo.GitRepositoryManager
diff --git a/plugins/performanceTesting/core/plugin-content.yaml b/plugins/performanceTesting/core/plugin-content.yaml
index ad7b263073c1..2c0b2a54dc53 100644
--- a/plugins/performanceTesting/core/plugin-content.yaml
+++ b/plugins/performanceTesting/core/plugin-content.yaml
@@ -16,13 +16,15 @@
 - name: lib/modules/intellij.performanceTesting.frontend.jar
   contentModules:
   - name: intellij.performanceTesting.frontend
+- name: lib/modules/intellij.performanceTesting.vcs.jar
+  contentModules:
+  - name: intellij.performanceTesting.vcs
 - name: lib/performanceTesting.jar
   modules:
   - name: intellij.performanceTesting
   contentModules:
   - name: intellij.performanceTesting.remoteDriver
   - name: intellij.performanceTesting.remoteDriver.compose
-  - name: intellij.performanceTesting.vcs
   - name: intellij.tools.ide.starter.bus
   - name: intellij.driver.model
   - name: intellij.driver.impl
diff --git a/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml b/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml
index 1bb51d92c0ea..5781ebe4cd5b 100644
--- a/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml
+++ b/plugins/performanceTesting/vcs/resources/intellij.performanceTesting.vcs.xml
@@ -1,4 +1,4 @@
-<idea-plugin visibility="internal" package="com.intellij.performanceTesting.vcs">
+<idea-plugin visibility="internal">
   <dependencies>
     <module name="intellij.platform.vcs.impl"/>
     <module name="intellij.platform.vcs.log.impl"/>