diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ObjectMarkupPropertiesDialog.form b/java/debugger/impl/src/com/intellij/debugger/actions/ObjectMarkupPropertiesDialog.form
index e476d7284b66..0d172ab94823 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ObjectMarkupPropertiesDialog.form
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ObjectMarkupPropertiesDialog.form
@@ -21,7 +21,7 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="label.object.markup.dialog.mark.referenced"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.object.markup.dialog.mark.referenced"/>
         </properties>
       </component>
     </children>
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.form b/java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.form
index 9e4c513abbb5..f85d5ac7fc1c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.form
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.form
@@ -13,7 +13,7 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="label.capture.configurable.debugger.agent"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.capture.configurable.debugger.agent"/>
         </properties>
       </component>
       <hspacer id="728e7">
@@ -26,7 +26,7 @@
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="label.capture.configurable.annotations.configure"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.capture.configurable.annotations.configure"/>
         </properties>
       </component>
       <grid id="5f9b3" binding="myCapturePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
@@ -39,7 +39,7 @@
           <component id="99787" class="com.intellij.ui.components.JBCheckBox" binding="myCaptureVariables">
             <constraints border-constraint="South"/>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.capture.configurable.capture.variables"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.capture.configurable.capture.variables"/>
             </properties>
           </component>
         </children>
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.form b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.form
index afa1f12219f4..9dfe34ae5684 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.form
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.form
@@ -22,7 +22,7 @@
             </constraints>
             <properties>
               <margin top="5" left="2" bottom="2" right="2"/>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.thread.groups"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.thread.groups"/>
             </properties>
           </component>
           <component id="5bfe" class="javax.swing.JCheckBox" binding="myShowSyntheticsCheckBox">
@@ -30,7 +30,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.stack.frames.for.synthetic.methods"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.stack.frames.for.synthetic.methods"/>
             </properties>
           </component>
           <component id="a7f8b" class="javax.swing.JCheckBox" binding="myShowCurrentThreadChechBox">
@@ -38,7 +38,7 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.current.thread.on.top"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.current.thread.on.top"/>
             </properties>
           </component>
         </children>
@@ -57,7 +57,7 @@
             </constraints>
             <properties>
               <margin top="5" left="2" bottom="2" right="2"/>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.line.number"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.line.number"/>
             </properties>
           </component>
           <component id="2fbc6" class="javax.swing.JCheckBox" binding="myClassNameCheckBox">
@@ -65,7 +65,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.class.name"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.class.name"/>
             </properties>
           </component>
           <component id="b56d7" class="javax.swing.JCheckBox" binding="mySourceCheckBox">
@@ -73,7 +73,7 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.source.file.name"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.source.file.name"/>
             </properties>
           </component>
           <component id="99bb5" class="javax.swing.JCheckBox" binding="myPackageCheckBox">
@@ -81,7 +81,7 @@
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.package"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.package"/>
             </properties>
           </component>
           <component id="9be9b" class="javax.swing.JCheckBox" binding="myArgsTypesCheckBox">
@@ -89,7 +89,7 @@
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.threads.view.configurable.show.prams.types"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.threads.view.configurable.show.prams.types"/>
             </properties>
           </component>
         </children>
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/GenericDebuggerParametersPatcherConfigurable.form b/java/debugger/impl/src/com/intellij/debugger/ui/GenericDebuggerParametersPatcherConfigurable.form
index d4c5f184e324..7ec4ad8c7806 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/GenericDebuggerParametersPatcherConfigurable.form
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/GenericDebuggerParametersPatcherConfigurable.form
@@ -21,7 +21,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem.address"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem.address"/>
             </properties>
           </component>
           <component id="af504" class="javax.swing.JTextField" binding="myAddressField">
@@ -49,7 +49,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.port"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.port"/>
             </properties>
           </component>
           <component id="3f860" class="javax.swing.JTextField" binding="myPortField">
@@ -67,7 +67,7 @@
           <grid row="1" column="1" row-span="2" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="button.debugger.settings"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="button.debugger.settings"/>
         </properties>
       </component>
       <grid id="b10c7" binding="myTransportPanel" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -83,7 +83,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.transport"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.transport"/>
             </properties>
           </component>
           <component id="f3bb4" class="javax.swing.JRadioButton" binding="mySocketTransport">
@@ -92,7 +92,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.socket"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.socket"/>
             </properties>
           </component>
           <component id="3bb61" class="javax.swing.JRadioButton" binding="myShmemTransport">
@@ -100,7 +100,7 @@
               <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="messages/DebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem"/>
+              <text resource-bundle="messages/JavaDebuggerBundle" key="label.generic.debugger.parameters.patcher.configurable.shmem"/>
             </properties>
           </component>
           <hspacer id="b3e0f">
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddFieldBreakpointDialog.form b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddFieldBreakpointDialog.form
index 5db94cfb63e3..4fc15ceb9870 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddFieldBreakpointDialog.form
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddFieldBreakpointDialog.form
@@ -54,7 +54,7 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="label.add.field.breakpoint.dialog.field.name"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.add.field.breakpoint.dialog.field.name"/>
         </properties>
       </component>
       <component id="c159b" class="javax.swing.JLabel">
@@ -63,7 +63,7 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0"/>
         </constraints>
         <properties>
-          <text resource-bundle="messages/DebuggerBundle" key="label.add.field.breakpoint.dialog.fq.name"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.add.field.breakpoint.dialog.fq.name"/>
         </properties>
       </component>
     </children>
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddWildcardBreakpointForm.form b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddWildcardBreakpointForm.form
index 9e9c62c6a000..ade647632a19 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddWildcardBreakpointForm.form
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AddWildcardBreakpointForm.form
@@ -26,7 +26,7 @@
         <properties>
           <labelFor value="2d944"/>
           <nextFocusableComponent value=""/>
-          <text resource-bundle="messages/DebuggerBundle" key="label.add.wildcard.breakpoint.dialog.method.name"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.add.wildcard.breakpoint.dialog.method.name"/>
         </properties>
       </component>
       <component id="2d944" class="javax.swing.JTextField" binding="myMethodNameField">
@@ -51,7 +51,7 @@
         </constraints>
         <properties>
           <labelFor value="ee438"/>
-          <text resource-bundle="messages/DebuggerBundle" key="label.add.wildcard.breakpoint.dialog.class.pattern"/>
+          <text resource-bundle="messages/JavaDebuggerBundle" key="label.add.wildcard.breakpoint.dialog.class.pattern"/>
         </properties>
       </component>
     </children>
diff --git a/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/JavaBreakpointFiltersPanel.form b/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/JavaBreakpointFiltersPanel.form
index b15a0a2f96ca..ec35bde22da7 100644
--- a/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/JavaBreakpointFiltersPanel.form
+++ b/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/JavaBreakpointFiltersPanel.form
@@ -33,7 +33,7 @@
                 </constraints>
                 <properties>
                   <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/DebuggerBundle" key="breakpoint.properties.panel.option.instance.filters"/>
+                  <text resource-bundle="messages/JavaDebuggerBundle" key="breakpoint.properties.panel.option.instance.filters"/>
                 </properties>
               </component>
               <grid id="5231f" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -71,7 +71,7 @@
                 </constraints>
                 <properties>
                   <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/DebuggerBundle" key="breakpoint.properties.panel.option.class.filters"/>
+                  <text resource-bundle="messages/JavaDebuggerBundle" key="breakpoint.properties.panel.option.class.filters"/>
                 </properties>
               </component>
               <grid id="9bef6" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -106,7 +106,7 @@
                 </constraints>
                 <properties>
                   <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/DebuggerBundle" key="breakpoint.properties.panel.option.pass.count"/>
+                  <text resource-bundle="messages/JavaDebuggerBundle" key="breakpoint.properties.panel.option.pass.count"/>
                 </properties>
               </component>
               <grid id="71095" binding="myPassCountFieldPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -151,7 +151,7 @@
                 </constraints>
                 <properties>
                   <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/DebuggerBundle" key="breakpoint.properties.panel.option.catch.class.filters"/>
+                  <text resource-bundle="messages/JavaDebuggerBundle" key="breakpoint.properties.panel.option.catch.class.filters"/>
                 </properties>
               </component>
               <grid id="63496" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -186,7 +186,7 @@
                 </constraints>
                 <properties>
                   <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/DebuggerBundle" key="breakpoint.properties.panel.option.caller.filter"/>
+                  <text resource-bundle="messages/JavaDebuggerBundle" key="breakpoint.properties.panel.option.caller.filter"/>
                 </properties>
               </component>
               <grid id="63d4d" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/java/debugger/openapi/intellij.java.debugger.iml b/java/debugger/openapi/intellij.java.debugger.iml
index 0e24bb660681..a2f322a18d83 100644
--- a/java/debugger/openapi/intellij.java.debugger.iml
+++ b/java/debugger/openapi/intellij.java.debugger.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
similarity index 100%
rename from resources-en/src/messages/DebuggerBundle.properties
rename to java/debugger/openapi/resources/messages/JavaDebuggerBundle.properties
diff --git a/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java b/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java
index 722aacc50187..f3bf146ebd10 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.PropertyKey;
 import java.util.function.Supplier;
 
 public class JavaDebuggerBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "messages.DebuggerBundle";
+  @NonNls private static final String BUNDLE = "messages.JavaDebuggerBundle";
   private static final JavaDebuggerBundle INSTANCE = new JavaDebuggerBundle();
 
   private JavaDebuggerBundle() { super(BUNDLE); }