diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
index 74bcd0036326..c76fb32297d9 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
@@ -170,6 +170,11 @@ public class JavaFXRenameTest extends DaemonAnalyzerTestCase {
     assertMethodExists(psiClass, newName);
   }
 
+  public void testStaticPropertyFromLibrary() throws Exception {
+    doTestErrorHint("Foo", "Cannot perform refactoring.\n" +
+                           "Selected method is not located inside the project");
+  }
+
   public void testControllerMethod() throws Exception {
     final PsiClass psiClass = doTestHandler("newName", null);
     assertMethodExists(psiClass, "getNewName");
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java
index dd774550864e..fe8d81f915ed 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java
@@ -283,7 +283,7 @@ public class JavaFxComponentIdReferenceProvider extends PsiReferenceProvider {
 
     @NotNull
     @Override
-    protected String getPropertyName() {
+    public String getPropertyName() {
       return myFieldName;
     }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java
index d6ecbb160549..29ddef78527d 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java
@@ -150,7 +150,7 @@ public class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferen
 
     @Nullable
     @Override
-    protected String getPropertyName() {
+    public String getPropertyName() {
       return PropertyUtil.getPropertyName(myFieldOrMethod);
     }
 
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java
index 3ab43f9bec3a..357ee1eb8576 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java
@@ -30,7 +30,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.javaFX.indexing.JavaFxImportsIndex;
-import org.jetbrains.plugins.javaFX.refactoring.JavaFxStaticPropertyElement;
+import org.jetbrains.plugins.javaFX.refactoring.JavaFxPropertyElement;
 
 import java.util.List;
 
@@ -45,8 +45,13 @@ public class JavaFxMethodSearcher implements QueryExecutor<PsiReference, Referen
     if (elementToSearch instanceof PsiMethod) {
       searchMethod((PsiMethod)elementToSearch, queryParameters, consumer);
     }
-    if (elementToSearch instanceof JavaFxStaticPropertyElement) {
-      searchMethod(((JavaFxStaticPropertyElement)elementToSearch).getMethod(), queryParameters, consumer);
+    if (elementToSearch instanceof JavaFxPropertyElement) {
+      final JavaFxPropertyElement propertyElement = (JavaFxPropertyElement)elementToSearch;
+      final JavaFxPropertyReference propertyReference = propertyElement.getPropertyReference();
+      final PsiMethod staticSetter = propertyReference.getStaticSetter();
+      if (staticSetter != null) {
+        searchMethod(staticSetter, queryParameters, consumer);
+      }
     }
     return true;
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxPropertyReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxPropertyReference.java
index 20d5ea00eda5..95d6d09ae84d 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxPropertyReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxPropertyReference.java
@@ -45,11 +45,16 @@ public abstract class JavaFxPropertyReference<T extends PsiElement> extends PsiR
     return JavaFxPsiUtil.findObservablePropertyGetter(myPsiClass, getPropertyName());
   }
 
+  @Nullable
+  public PsiMethod getStaticSetter() {
+    return null;
+  }
+
   @Nullable
   public PsiType getType() {
     return JavaFxPsiUtil.getReadablePropertyType(resolve());
   }
 
   @Nullable
-  protected abstract String getPropertyName();
+  public abstract String getPropertyName();
 }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxStaticPropertyReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxStaticPropertyReference.java
index 13d772e04195..0b84f3708756 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxStaticPropertyReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxStaticPropertyReference.java
@@ -11,14 +11,14 @@ import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil;
 /**
  * @author Pavel.Dolgov
  */
-public class JavaFxStaticPropertyReference extends PsiReferenceBase<XmlAttribute> {
+public class JavaFxStaticPropertyReference extends JavaFxPropertyReference<XmlAttribute> {
   private String myPropertyName;
   private PsiMethod myStaticMethod;
 
   public JavaFxStaticPropertyReference(@NotNull XmlAttribute xmlAttribute,
                                        @Nullable PsiClass psiClass,
                                        @NotNull String propertyName) {
-    super(xmlAttribute);
+    super(xmlAttribute, psiClass);
     myPropertyName = propertyName;
     myStaticMethod = JavaFxPsiUtil.findStaticPropertySetter(propertyName, psiClass);
   }
@@ -29,6 +29,37 @@ public class JavaFxStaticPropertyReference extends PsiReferenceBase<XmlAttribute
     return myStaticMethod;
   }
 
+  @Nullable
+  @Override
+  public PsiMethod getGetter() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiMethod getSetter() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiField getField() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiMethod getObservableGetter() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiMethod getStaticSetter() {
+    return myStaticMethod;
+  }
+
+  @Override
   public PsiType getType() {
     if (myStaticMethod != null) {
       final PsiParameter[] parameters = myStaticMethod.getParameterList().getParameters();
@@ -39,14 +70,11 @@ public class JavaFxStaticPropertyReference extends PsiReferenceBase<XmlAttribute
     return null;
   }
 
+  @Override
   public String getPropertyName() {
     return myPropertyName;
   }
 
-  public PsiMethod getStaticMethod() {
-    return myStaticMethod;
-  }
-
   @NotNull
   @Override
   public Object[] getVariants() {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxImportsIndex.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxImportsIndex.java
index 6e6678e75818..f705893b0ec7 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxImportsIndex.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxImportsIndex.java
@@ -33,7 +33,6 @@ import com.intellij.util.xml.NanoXmlUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.plugins.javaFX.fxml.JavaFxNamespaceDataProvider;
 
 import java.io.Reader;
 import java.io.StringReader;
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyElement.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyElement.java
index 7f497cf6b02d..fb7331e4c6e4 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyElement.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyElement.java
@@ -5,7 +5,6 @@ import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.impl.beanProperties.BeanPropertyElement;
-import com.intellij.psi.util.PropertyUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxPropertyReference;
@@ -13,10 +12,10 @@ import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxPropertyReference;
 /**
  * @author Pavel.Dolgov
  */
-class JavaFxPropertyElement extends BeanPropertyElement {
+public class JavaFxPropertyElement extends BeanPropertyElement {
   private final JavaFxPropertyReference myPropertyReference;
 
-  private JavaFxPropertyElement(JavaFxPropertyReference propertyReference, String propertyName, PsiMethod method) {
+  private JavaFxPropertyElement(PsiMethod method, String propertyName, JavaFxPropertyReference propertyReference) {
     super(method, propertyName);
     myPropertyReference = propertyReference;
   }
@@ -32,14 +31,18 @@ class JavaFxPropertyElement extends BeanPropertyElement {
     return "property";
   }
 
+  @NotNull
+  public JavaFxPropertyReference getPropertyReference() {
+    return myPropertyReference;
+  }
+
   @Nullable
   static PsiElement fromReference(@NotNull final JavaFxPropertyReference propertyReference) {
     final PsiElement element = propertyReference.resolve();
     if (element instanceof PsiMethod) {
-      final PsiMethod method = (PsiMethod)element;
-      final String propertyName = PropertyUtil.getPropertyName(method);
+      final String propertyName = propertyReference.getPropertyName();
       if (propertyName != null) {
-        return new JavaFxPropertyElement(propertyReference, propertyName, method);
+        return new JavaFxPropertyElement((PsiMethod)element, propertyName, propertyReference);
       }
     }
     if (element instanceof PsiField) {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java
index 0d0f5c09005e..6e7b0a972de6 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java
@@ -6,7 +6,10 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.xml.XmlFile;
@@ -16,7 +19,7 @@ import com.intellij.refactoring.rename.PsiElementRenameHandler;
 import com.intellij.refactoring.rename.RenameDialog;
 import com.intellij.refactoring.rename.RenameHandler;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.NotNullProducer;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -24,9 +27,7 @@ import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonNames;
 import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
 import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxComponentIdReferenceProvider;
 import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxPropertyReference;
-import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxStaticPropertyReference;
 
-import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -64,38 +65,24 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
     }
     if (reference instanceof JavaFxPropertyReference && reference.resolve() != null) {
       final JavaFxPropertyReference propertyReference = (JavaFxPropertyReference)reference;
+      final Map<PsiElement, String> elementsToRename = getElementsToRename(propertyReference, "a");
+      final boolean cannotRename = !elementsToRename.isEmpty() &&
+                                   elementsToRename.keySet().stream()
+                                     .anyMatch(element -> !PsiElementRenameHandler.canRename(project, editor, element));
+      if (cannotRename) {
+        return;
+      }
       if (ApplicationManager.getApplication().isUnitTestMode()) {
         final String newName = PsiElementRenameHandler.DEFAULT_NAME.getData(dataContext);
         assert newName != null : "Rename property";
         doRename(propertyReference, newName, false, false);
         return;
       }
-      final Map<String, PsiElement> elementsToRename = getElementsToRename(propertyReference, "a");
-      for (PsiElement element : elementsToRename.values()) {
-        if (!PsiElementRenameHandler.canRename(project, editor, element)) return;
-      }
       final PsiElement psiElement = JavaFxPropertyElement.fromReference(propertyReference);
       if (psiElement != null) {
         new PropertyRenameDialog(propertyReference, psiElement, project, editor).show();
       }
     }
-    if (reference instanceof JavaFxStaticPropertyReference) {
-      final JavaFxStaticPropertyReference propertyReference = (JavaFxStaticPropertyReference)reference;
-      if (ApplicationManager.getApplication().isUnitTestMode()) {
-        final String newName = PsiElementRenameHandler.DEFAULT_NAME.getData(dataContext);
-        assert newName != null : "Rename property";
-        doRenameStatic(propertyReference, newName, false, false);
-        return;
-      }
-      final Map<String, PsiElement> elementsToRename = getStaticElementsToRename(propertyReference, "a");
-      for (PsiElement element : elementsToRename.values()) {
-        if (!PsiElementRenameHandler.canRename(project, editor, element)) return;
-      }
-      final PsiElement psiElement = JavaFxStaticPropertyElement.fromReference(propertyReference);
-      if (psiElement != null) {
-        new PropertyRenameDialog(reference, psiElement, project, editor).show();
-      }
-    }
   }
 
   private static void doRename(JavaFxPropertyReference reference, String newName, final boolean searchInComments, boolean isPreview) {
@@ -104,28 +91,11 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
     final RenameRefactoring rename = new JavaRenameRefactoringImpl(psiElement.getProject(), psiElement, newName, searchInComments, false);
     rename.setPreviewUsages(isPreview);
 
-    final Map<String, PsiElement> elementsToRename = getElementsToRename(reference, newName);
-    for (Map.Entry<String, PsiElement> entry : elementsToRename.entrySet()) {
-      rename.addElement(entry.getValue(), entry.getKey());
-    }
+    final Map<PsiElement, String> elementsToRename = getElementsToRename(reference, newName);
+    elementsToRename.forEach(rename::addElement);
     rename.run();
   }
 
-  private static void doRenameStatic(JavaFxStaticPropertyReference reference,
-                                     String newName,
-                                     final boolean searchInComments,
-                                     boolean isPreview) {
-    final PsiElement psiElement = JavaFxStaticPropertyElement.fromReference(reference);
-    if (psiElement == null) return;
-    final RenameRefactoring rename = new JavaRenameRefactoringImpl(psiElement.getProject(), psiElement, newName, searchInComments, false);
-    rename.setPreviewUsages(isPreview);
-
-    final Map<String, PsiElement> elementsToRename = getStaticElementsToRename(reference, newName);
-    for (Map.Entry<String, PsiElement> entry : elementsToRename.entrySet()) {
-      rename.addElement(entry.getValue(), entry.getKey());
-    }
-    rename.run();
-  }
 
   @Nullable
   private static PsiReference getReference(DataContext dataContext) {
@@ -159,7 +129,6 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
 
   private static boolean isKnown(PsiReference reference) {
     if (reference instanceof JavaFxPropertyReference) return true;
-    if (reference instanceof JavaFxStaticPropertyReference) return ((JavaFxStaticPropertyReference)reference).getStaticMethod() != null;
     if (reference instanceof JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase) {
       return ((JavaFxComponentIdReferenceProvider.JavaFxIdReferenceBase)reference).isBuiltIn();
     }
@@ -167,28 +136,26 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
   }
 
   @NotNull
-  private static Map<String, PsiElement> getElementsToRename(@NotNull JavaFxPropertyReference reference, @NotNull String newPropertyName) {
-    final Map<String, PsiElement> rename = new THashMap<>();
-    ContainerUtil.putIfNotNull(newPropertyName, reference.getField(), rename);
-    ContainerUtil.putIfNotNull(PropertyUtil.suggestGetterName(newPropertyName, reference.getType()), reference.getGetter(), rename);
-    ContainerUtil.putIfNotNull(PropertyUtil.suggestSetterName(newPropertyName), reference.getSetter(), rename);
-    ContainerUtil.putIfNotNull(newPropertyName + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX, reference.getObservableGetter(), rename);
+  private static Map<PsiElement, String> getElementsToRename(@NotNull JavaFxPropertyReference reference, @NotNull String newPropertyName) {
+    final Map<PsiElement, String> rename = new THashMap<>();
+    putIfKeyNotNull(rename, reference.getGetter(), () -> PropertyUtil.suggestGetterName(newPropertyName, reference.getType()));
+    putIfKeyNotNull(rename, reference.getField(), () -> newPropertyName);
+    putIfKeyNotNull(rename, reference.getSetter(), () -> PropertyUtil.suggestSetterName(newPropertyName));
+    putIfKeyNotNull(rename, reference.getObservableGetter(), () -> newPropertyName + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX);
+    putIfKeyNotNull(rename, reference.getStaticSetter(), () -> PropertyUtil.suggestSetterName(newPropertyName));
     //TODO add "name" parameter of the observable property constructor (like new SimpleObjectProperty(this, "name", null);
     return rename;
   }
 
-  private static Map<String, PsiElement> getStaticElementsToRename(@NotNull JavaFxStaticPropertyReference reference,
-                                                                   @NotNull String newPropertyName) {
-    final PsiMethod method = reference.getStaticMethod();
-    if (method == null) return Collections.emptyMap();
-    return Collections.singletonMap(PropertyUtil.suggestSetterName(newPropertyName), method);
+  private static <K, V> void putIfKeyNotNull(Map<K, V> map, K key, NotNullProducer<V> valueProducer) {
+    if (key != null) map.put(key, valueProducer.produce());
   }
 
   private static class PropertyRenameDialog extends RenameDialog {
 
-    private final PsiReference myPropertyReference;
+    private final JavaFxPropertyReference myPropertyReference;
 
-    protected PropertyRenameDialog(@NotNull PsiReference propertyReference,
+    protected PropertyRenameDialog(@NotNull JavaFxPropertyReference propertyReference,
                                    @NotNull PsiElement psiElement,
                                    @NotNull Project project,
                                    Editor editor) {
@@ -199,12 +166,7 @@ public class JavaFxPropertyRenameHandler implements RenameHandler {
     protected void doAction() {
       final String newName = getNewName();
       final boolean searchInComments = isSearchInComments();
-      if (myPropertyReference instanceof JavaFxPropertyReference) {
-        doRename((JavaFxPropertyReference)myPropertyReference, newName, searchInComments, isPreviewUsages());
-      }
-      else if (myPropertyReference instanceof JavaFxStaticPropertyReference) {
-        doRenameStatic((JavaFxStaticPropertyReference)myPropertyReference, newName, searchInComments, isPreviewUsages());
-      }
+      doRename(myPropertyReference, newName, searchInComments, isPreviewUsages());
       close(DialogWrapper.OK_EXIT_CODE);
     }
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxStaticPropertyElement.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxStaticPropertyElement.java
deleted file mode 100644
index ddfa1dcc489e..000000000000
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxStaticPropertyElement.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jetbrains.plugins.javaFX.refactoring;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiType;
-import com.intellij.psi.impl.beanProperties.BeanPropertyElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxStaticPropertyReference;
-
-/**
- * @author Pavel.Dolgov
- */
-public class JavaFxStaticPropertyElement extends BeanPropertyElement {
-  private final JavaFxStaticPropertyReference myPropertyReference;
-
-  private JavaFxStaticPropertyElement(JavaFxStaticPropertyReference propertyReference, String propertyName, PsiMethod method) {
-    super(method, propertyName);
-    myPropertyReference = propertyReference;
-  }
-
-  @Nullable
-  @Override
-  public PsiType getPropertyType() {
-    return myPropertyReference.getType();
-  }
-
-  @Override
-  public String getTypeName() {
-    return "property";
-  }
-
-  @Nullable
-  static PsiElement fromReference(@NotNull final JavaFxStaticPropertyReference propertyReference) {
-    final PsiMethod method = propertyReference.getStaticMethod();
-    if (method != null) {
-      final String propertyName = propertyReference.getPropertyName();
-      if (propertyName != null) {
-        return new JavaFxStaticPropertyElement(propertyReference, propertyName, method);
-      }
-    }
-    return null;
-  }
-}
diff --git a/plugins/javaFX/testData/rename/StaticPropertyFromLibrary.java b/plugins/javaFX/testData/rename/StaticPropertyFromLibrary.java
new file mode 100644
index 000000000000..8ca65ac0c6a9
--- /dev/null
+++ b/plugins/javaFX/testData/rename/StaticPropertyFromLibrary.java
@@ -0,0 +1 @@
+class StaticPropertyFromLibrary {}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/rename/staticPropertyFromLibrary.fxml b/plugins/javaFX/testData/rename/staticPropertyFromLibrary.fxml
new file mode 100644
index 000000000000..b160797ffba7
--- /dev/null
+++ b/plugins/javaFX/testData/rename/staticPropertyFromLibrary.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.Label?>
+<HBox>
+  <Label HBox.hg<caret>row="ALWAYS"/>
+</HBox>
\ No newline at end of file