diff --git a/gradle.properties b/gradle.properties
index e2412aabc..ac5402130 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,9 +2,9 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 #
-#ideaVersion=2017.2
+ideaVersion=2017.2
 #ideaVersion=2017.2.7
-ideaVersion=2017.3
+#ideaVersion=2017.3
 #ideaVersion=2017.3.5
 #
 lastReleaseVersion=2019.1
diff --git a/src/main/java/de/plushnikov/intellij/plugin/action/delombok/DelombokHandler.java b/src/main/java/de/plushnikov/intellij/plugin/action/delombok/DelombokHandler.java
index 7bc10e581..909379c12 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/action/delombok/DelombokHandler.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/action/delombok/DelombokHandler.java
@@ -306,7 +306,7 @@ private String getTypeWithParameter(@NotNull PsiClassType psiClassType) {
     if (psiClassType instanceof PsiClassReferenceType) {
       return ((PsiClassReferenceType) psiClassType).getReference().getText();
     }
-    return psiClassType.getName();
+    return psiClassType.getClassName();
   }
 
   private void copyModifiers(PsiModifierList fromModifierList, PsiModifierList resultModifierList) {
diff --git a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java
index 44c8d59ce..95bf363c7 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokElementFinder.java
@@ -1,5 +1,6 @@
 package de.plushnikov.intellij.plugin.extension;
 
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElementFinder;
@@ -13,7 +14,7 @@ public class LombokElementFinder extends PsiElementFinder {
   private final JavaFileManager myFileManager;
 
   public LombokElementFinder(Project project) {
-    myFileManager = JavaFileManager.getInstance(project);
+    myFileManager = ServiceManager.getService(project, JavaFileManager.class);
   }
 
   @Nullable