diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 09e4796551f..2e7d50bef07 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2813,13 +2813,13 @@
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameDynamicMemberHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameOnSecondaryConstructorHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJavaSyntheticPropertyHandler"/>
+    <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameSyntheticDeclarationByReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.JavaMemberByKotlinReferenceInplaceRenameHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJvmNameHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameBackingFieldReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameClassByCompanionObjectShortReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameByLabeledReferenceInLambdaArgumentHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameImportAliasByReferenceHandler"/>
-    <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameSyntheticDeclarationByReferenceHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler"/>
     <renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler"/>
 
diff --git a/idea/testData/refactoring/rename/javaEnumValueOf/after/JavaEnum.java b/idea/testData/refactoring/rename/javaEnumValueOf/after/JavaEnum.java
new file mode 100644
index 00000000000..b3cfbf99694
--- /dev/null
+++ b/idea/testData/refactoring/rename/javaEnumValueOf/after/JavaEnum.java
@@ -0,0 +1,3 @@
+public enum JavaEnum {
+    V1, V2
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/javaEnumValueOf/after/test.kt b/idea/testData/refactoring/rename/javaEnumValueOf/after/test.kt
new file mode 100644
index 00000000000..19d54bafce2
--- /dev/null
+++ b/idea/testData/refactoring/rename/javaEnumValueOf/after/test.kt
@@ -0,0 +1 @@
+val jenum = JavaEnum./*rename*/valueOf("V1")
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/javaEnumValueOf/before/JavaEnum.java b/idea/testData/refactoring/rename/javaEnumValueOf/before/JavaEnum.java
new file mode 100644
index 00000000000..b3cfbf99694
--- /dev/null
+++ b/idea/testData/refactoring/rename/javaEnumValueOf/before/JavaEnum.java
@@ -0,0 +1,3 @@
+public enum JavaEnum {
+    V1, V2
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/javaEnumValueOf/before/test.kt b/idea/testData/refactoring/rename/javaEnumValueOf/before/test.kt
new file mode 100644
index 00000000000..19d54bafce2
--- /dev/null
+++ b/idea/testData/refactoring/rename/javaEnumValueOf/before/test.kt
@@ -0,0 +1 @@
+val jenum = JavaEnum./*rename*/valueOf("V1")
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test b/idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test
new file mode 100644
index 00000000000..81a1a57cb22
--- /dev/null
+++ b/idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test
@@ -0,0 +1,7 @@
+{
+  "type": "AUTO_DETECT",
+  "mainFile": "test.kt",
+  "newName": "valueOfNew",
+  "withRuntime": "true",
+  "hint": "Rename is not applicable to synthetic declaration"
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
index d7cd1b4ebee..19b0766de66 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
@@ -253,6 +253,12 @@ public class RenameTestGenerated extends AbstractRenameTest {
         doTest(fileName);
     }
 
+    @TestMetadata("javaEnumValueOf/javaEnumValueOf.test")
+    public void testJavaEnumValueOf_JavaEnumValueOf() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/javaEnumValueOf/javaEnumValueOf.test");
+        doTest(fileName);
+    }
+
     @TestMetadata("labeledAnonymousFunByLabel/labeledLambdaByLabel.test")
     public void testLabeledAnonymousFunByLabel_LabeledLambdaByLabel() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/labeledAnonymousFunByLabel/labeledLambdaByLabel.test");