diff --git a/idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerTabnineInlineCompletionAction.kt b/idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerInlineCompletionAction.kt
similarity index 92%
rename from idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerTabnineInlineCompletionAction.kt
rename to idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerInlineCompletionAction.kt
index 1f59938..db61972 100644
--- a/idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerTabnineInlineCompletionAction.kt
+++ b/idea-plugin/src/main/java/com/tabnineCommon/inline/ManualTriggerInlineCompletionAction.kt
@@ -12,7 +12,7 @@ import de.appliedai.autodev.util.TaskLogger
 import de.appliedai.autodev.util.TempLogger
 import de.appliedai.autodev.autocomplete.InlineCompletionHandler
 
-class ManualTriggerTabnineInlineCompletionAction :
+class ManualTriggerInlineCompletionAction :
         BaseCodeInsightAction(false),
         DumbAware,
     InlineCompletionAction {
@@ -20,7 +20,7 @@ class ManualTriggerTabnineInlineCompletionAction :
         const val ACTION_ID = "ManualTriggerTabnineInlineCompletionAction"
     }
 
-    private val log = TempLogger(ManualTriggerTabnineInlineCompletionAction::class.java)
+    private val log = TempLogger(ManualTriggerInlineCompletionAction::class.java)
     private var nextTaskId = 1
     private val handler = InlineCompletionHandler.getInstance()
     private val completionsEventSender = DependencyContainer.instanceOfCompletionsEventSender()
diff --git a/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabNineCompletionContributor.java b/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/CompletionContributor.java
similarity index 99%
rename from idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabNineCompletionContributor.java
rename to idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/CompletionContributor.java
index 92803da..16b5980 100644
--- a/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabNineCompletionContributor.java
+++ b/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/CompletionContributor.java
@@ -37,7 +37,7 @@
 
 import static com.tabnineCommon.general.StaticConfig.*;
 
-public class TabNineCompletionContributor extends CompletionContributor {
+public class CompletionContributor extends com.intellij.codeInsight.completion.CompletionContributor {
   private final CompletionFacade completionFacade =
       DependencyContainer.instanceOfCompletionFacade();
   private final TabNineLookupListener tabNineLookupListener = instanceOfTabNineLookupListener();
diff --git a/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabnineDocumentListener.java b/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/DocumentListener.java
similarity index 96%
rename from idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabnineDocumentListener.java
rename to idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/DocumentListener.java
index 03b0aab..2425593 100644
--- a/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/TabnineDocumentListener.java
+++ b/idea-plugin/src/main/java/de/appliedai/autodev/autocomplete/DocumentListener.java
@@ -30,13 +30,13 @@
 import static com.intellij.openapi.editor.EditorModificationUtil.checkModificationAllowed;
 import static com.tabnineCommon.general.DependencyContainer.instanceOfSuggestionsModeService;
 
-public class TabnineDocumentListener implements BulkAwareDocumentListener {
+public class DocumentListener implements BulkAwareDocumentListener {
   private final InlineCompletionHandler handler = InlineCompletionHandler.getInstance();
   private final SuggestionsModeService suggestionsModeService = instanceOfSuggestionsModeService();
   private final CompletionsEventSender completionsEventSender =
       DependencyContainer.instanceOfCompletionsEventSender();
 
-  private final TempLogger log = TempLogger.getInstance(TabnineDocumentListener.class);
+  private final TempLogger log = TempLogger.getInstance(DocumentListener.class);
   private long nextTaskId = 1;
 
   @Override
diff --git a/idea-plugin/src/main/resources/META-INF/plugin.xml b/idea-plugin/src/main/resources/META-INF/plugin.xml
index 333f5ea..19f92ad 100644
--- a/idea-plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea-plugin/src/main/resources/META-INF/plugin.xml
@@ -30,9 +30,9 @@
     <editorActionHandler action="EditorEscape" implementationClass="com.tabnineCommon.inline.EscapeHandler"
                          id="previewEscape" order="before hide-hints"/>
     <completion.contributor language="any"
-                            implementationClass="de.appliedai.autodev.autocomplete.TabNineCompletionContributor"
+                            implementationClass="de.appliedai.autodev.autocomplete.CompletionContributor"
                             order="first"/>
-    <editorFactoryDocumentListener implementation="de.appliedai.autodev.autocomplete.TabnineDocumentListener"/>
+    <editorFactoryDocumentListener implementation="de.appliedai.autodev.autocomplete.DocumentListener"/>
     <applicationService serviceImplementation="com.tabnineCommon.userSettings.AppSettingsState"/>
   </extensions>
 
@@ -50,7 +50,7 @@
             id="AcceptTabnineInlineCompletionAction" text="Accept Inline Completion">
       <keyboard-shortcut first-keystroke="TAB" keymap="$default"/>
     </action>
-    <action class="com.tabnineCommon.inline.ManualTriggerTabnineInlineCompletionAction"
+    <action class="com.tabnineCommon.inline.ManualTriggerInlineCompletionAction"
             id="ManualTriggerTabnineInlineCompletionAction" text="Trigger Inline Completion">
       <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="$Paste"/>
       <keyboard-shortcut first-keystroke="ctrl I" keymap="$default"/>