diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterHintsPassFactory.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterHintsPassFactory.java
index 421eea5d3f74..d9ff57b6dc47 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterHintsPassFactory.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterHintsPassFactory.java
@@ -21,6 +21,7 @@ import com.intellij.codeHighlighting.TextEditorHighlightingPassFactory;
 import com.intellij.codeHighlighting.TextEditorHighlightingPassRegistrar;
 import com.intellij.codeInsight.hints.filtering.Matcher;
 import com.intellij.codeInsight.hints.filtering.MatcherConstructor;
+import com.intellij.codeInsight.hints.settings.ParameterNameHintsSettings;
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.editor.Caret;
 import com.intellij.openapi.editor.Editor;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ShowParameterHintsSettings.kt b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ShowParameterHintsSettings.kt
index 109eeeb7aa9c..5f84a753bff8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ShowParameterHintsSettings.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ShowParameterHintsSettings.kt
@@ -15,7 +15,8 @@
  */
 package com.intellij.codeInsight.daemon.impl
 
-import com.intellij.codeInsight.daemon.impl.hints.ParameterNameHintsConfigurable
+import com.intellij.codeInsight.hints.settings.ParameterNameHintsConfigurable
+import com.intellij.codeInsight.hints.settings.ParameterNameHintsSettings
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.form b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.form
similarity index 97%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.form
rename to platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.form
index 79126897e10e..c60874b8a8e4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.form
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.codeInsight.daemon.impl.hints.ParameterNameHintsConfigurable">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.codeInsight.hints.settings.ParameterNameHintsConfigurable">
   <grid id="27dc6" binding="myConfigurable" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.java b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.java
similarity index 96%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.java
rename to platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.java
index b406e63a4316..1dfc0f4b6b5a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/hints/ParameterNameHintsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsConfigurable.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.codeInsight.daemon.impl.hints;
+package com.intellij.codeInsight.hints.settings;
 
-import com.intellij.codeInsight.daemon.impl.ParameterNameHintsSettings;
 import com.intellij.codeInsight.hints.filtering.MatcherConstructor;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.editor.event.DocumentAdapter;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterNameHintsSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsSettings.java
similarity index 98%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterNameHintsSettings.java
rename to platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsSettings.java
index c27df9f24fa7..abc0de770725 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ParameterNameHintsSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/settings/ParameterNameHintsSettings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.codeInsight.daemon.impl;
+package com.intellij.codeInsight.hints.settings;
 
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 862ff51e38ca..45fd1312c53c 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -327,7 +327,7 @@
                         serviceImplementation="com.intellij.openapi.actionSystem.impl.AbbreviationManagerImpl"/>
 
     <applicationService serviceImplementation="com.intellij.openapi.editor.ex.EditorSettingsExternalizable"/>
-    <applicationService serviceImplementation="com.intellij.codeInsight.daemon.impl.ParameterNameHintsSettings"/>
+    <applicationService serviceImplementation="com.intellij.codeInsight.hints.settings.ParameterNameHintsSettings"/>
     <applicationService serviceImplementation="com.intellij.openapi.keymap.KeyboardSettingsExternalizable"/>
     <applicationService serviceImplementation="com.intellij.openapi.editor.SpellCheckingEditorCustomizationProvider"/>