diff --git a/intellij/src/main/kotlin/motif/intellij/AttachMotifProjectServiceActivity.kt b/intellij/src/main/kotlin/motif/intellij/AttachMotifServiceActivity.kt
similarity index 88%
rename from intellij/src/main/kotlin/motif/intellij/AttachMotifProjectServiceActivity.kt
rename to intellij/src/main/kotlin/motif/intellij/AttachMotifServiceActivity.kt
index 71699f9d..86f8d7ed 100644
--- a/intellij/src/main/kotlin/motif/intellij/AttachMotifProjectServiceActivity.kt
+++ b/intellij/src/main/kotlin/motif/intellij/AttachMotifServiceActivity.kt
@@ -19,8 +19,8 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
 
-class AttachMotifProjectServiceActivity : ProjectActivity {
+class AttachMotifServiceActivity : ProjectActivity {
   override suspend fun execute(project: Project) {
-    project.service<MotifProjectService>().attach()
+    project.service<MotifService>().attach()
   }
 }
diff --git a/intellij/src/main/kotlin/motif/intellij/MotifProjectService.kt b/intellij/src/main/kotlin/motif/intellij/MotifService.kt
similarity index 96%
rename from intellij/src/main/kotlin/motif/intellij/MotifProjectService.kt
rename to intellij/src/main/kotlin/motif/intellij/MotifService.kt
index 9b40cc6c..cfb1adf7 100644
--- a/intellij/src/main/kotlin/motif/intellij/MotifProjectService.kt
+++ b/intellij/src/main/kotlin/motif/intellij/MotifService.kt
@@ -39,7 +39,7 @@ import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentFactory
 import javax.swing.Icon
 import motif.core.ResolvedGraph
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 import motif.intellij.ui.MotifErrorPanel
 import motif.intellij.ui.MotifScopePanel
@@ -47,7 +47,7 @@ import motif.intellij.ui.MotifUsagePanel
 import org.jetbrains.kotlin.idea.KotlinLanguage
 
 @Service(Service.Level.PROJECT)
-class MotifProjectService(val project: Project) : Disposable {
+class MotifService(val project: Project) : Disposable {
 
   companion object {
     const val TOOL_WINDOW_ID: String = "Motif"
@@ -86,7 +86,7 @@ class MotifProjectService(val project: Project) : Disposable {
         onGraphUpdated(emptyGraph)
 
         project
-            .getService(AnalyticsProjectService::class.java)
+            .getService(AnalyticsService::class.java)
             .logEvent(MotifAnalyticsActions.PROJECT_OPENED)
       }
     }
@@ -113,13 +113,13 @@ class MotifProjectService(val project: Project) : Disposable {
                         if (updatedGraph.errors.isNotEmpty())
                             MotifAnalyticsActions.GRAPH_UPDATE_ERROR
                         else MotifAnalyticsActions.GRAPH_UPDATE_SUCCESS
-                    project.getService(AnalyticsProjectService::class.java).logEvent(eventName)
+                    project.getService(AnalyticsService::class.java).logEvent(eventName)
                   } catch (t: Throwable) {
                     val emptyGraph: ResolvedGraph = ResolvedGraph.create(emptyList())
                     onGraphUpdated(emptyGraph)
 
                     project
-                        .getService(AnalyticsProjectService::class.java)
+                        .getService(AnalyticsService::class.java)
                         .logEvent(MotifAnalyticsActions.GRAPH_COMPUTATION_ERROR)
                     PluginManager.getLogger().error(LABEL_GRAPH_COMPUTATION_ERROR, t)
                   } finally {
diff --git a/intellij/src/main/kotlin/motif/intellij/actions/MotifAncestorGraphAction.kt b/intellij/src/main/kotlin/motif/intellij/actions/MotifAncestorGraphAction.kt
index b0aa009b..744c9a9b 100644
--- a/intellij/src/main/kotlin/motif/intellij/actions/MotifAncestorGraphAction.kt
+++ b/intellij/src/main/kotlin/motif/intellij/actions/MotifAncestorGraphAction.kt
@@ -23,18 +23,18 @@ import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
-import motif.intellij.MotifProjectService.Companion.TOOL_WINDOW_ID
+import motif.intellij.MotifService
+import motif.intellij.MotifService.Companion.TOOL_WINDOW_ID
 import motif.intellij.ScopeHierarchyUtils.Companion.getParentScopes
 import motif.intellij.ScopeHierarchyUtils.Companion.isInitializedGraph
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifScopeClass
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 
 /*
  * {@AnAction} used to trigger displaying a particular scope ancestors hierarchy.
  */
-class MotifAncestorGraphAction : AnAction(), MotifProjectService.Listener {
+class MotifAncestorGraphAction : AnAction(), MotifService.Listener {
 
   private var graph: ResolvedGraph? = null
 
@@ -48,18 +48,18 @@ class MotifAncestorGraphAction : AnAction(), MotifProjectService.Listener {
     val graph = graph ?: return
 
     if (!isInitializedGraph(graph)) {
-      project.getService(MotifProjectService::class.java).refreshGraph { actionPerformed(event) }
+      project.getService(MotifService::class.java).refreshGraph { actionPerformed(event) }
       return
     }
 
     val toolWindow: ToolWindow =
         ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID) ?: return
     toolWindow.activate {
-      project.getService(MotifProjectService::class.java).onSelectedAncestorScope(element)
+      project.getService(MotifService::class.java).onSelectedAncestorScope(element)
     }
 
     project
-        .getService(AnalyticsProjectService::class.java)
+        .getService(AnalyticsService::class.java)
         .logEvent(MotifAnalyticsActions.ANCESTOR_MENU_CLICK)
   }
 
diff --git a/intellij/src/main/kotlin/motif/intellij/actions/MotifGraphAction.kt b/intellij/src/main/kotlin/motif/intellij/actions/MotifGraphAction.kt
index 0fbbde2b..9f33ac99 100644
--- a/intellij/src/main/kotlin/motif/intellij/actions/MotifGraphAction.kt
+++ b/intellij/src/main/kotlin/motif/intellij/actions/MotifGraphAction.kt
@@ -20,16 +20,16 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowManager
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
-import motif.intellij.MotifProjectService.Companion.TOOL_WINDOW_ID
+import motif.intellij.MotifService
+import motif.intellij.MotifService.Companion.TOOL_WINDOW_ID
 import motif.intellij.ScopeHierarchyUtils.Companion.isInitializedGraph
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 
 /*
  * {@AnAction} used to trigger displaying entire scope hierarchy.
  */
-class MotifGraphAction : AnAction(), MotifProjectService.Listener {
+class MotifGraphAction : AnAction(), MotifService.Listener {
 
   private var graph: ResolvedGraph? = null
 
@@ -42,7 +42,7 @@ class MotifGraphAction : AnAction(), MotifProjectService.Listener {
     val graph = graph ?: return
 
     if (!isInitializedGraph(graph)) {
-      project.getService(MotifProjectService::class.java).refreshGraph { actionPerformed(event) }
+      project.getService(MotifService::class.java).refreshGraph { actionPerformed(event) }
       return
     }
 
@@ -51,7 +51,7 @@ class MotifGraphAction : AnAction(), MotifProjectService.Listener {
     toolWindow.activate {}
 
     project
-        .getService(AnalyticsProjectService::class.java)
+        .getService(AnalyticsService::class.java)
         .logEvent(MotifAnalyticsActions.GRAPH_MENU_CLICK)
   }
 
diff --git a/intellij/src/main/kotlin/motif/intellij/actions/MotifUsageAction.kt b/intellij/src/main/kotlin/motif/intellij/actions/MotifUsageAction.kt
index e5c85263..35392a60 100644
--- a/intellij/src/main/kotlin/motif/intellij/actions/MotifUsageAction.kt
+++ b/intellij/src/main/kotlin/motif/intellij/actions/MotifUsageAction.kt
@@ -23,17 +23,17 @@ import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
-import motif.intellij.MotifProjectService.Companion.TOOL_WINDOW_ID
+import motif.intellij.MotifService
+import motif.intellij.MotifService.Companion.TOOL_WINDOW_ID
 import motif.intellij.ScopeHierarchyUtils
 import motif.intellij.ScopeHierarchyUtils.Companion.getUsageCount
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 
 /*
  * {@AnAction} used to trigger navigation to a particular scope in the scope hierarchy window.
  */
-class MotifUsageAction : AnAction(), MotifProjectService.Listener {
+class MotifUsageAction : AnAction(), MotifService.Listener {
 
   private var graph: ResolvedGraph? = null
 
@@ -47,18 +47,16 @@ class MotifUsageAction : AnAction(), MotifProjectService.Listener {
     val graph = graph ?: return
 
     if (!ScopeHierarchyUtils.isInitializedGraph(graph)) {
-      project.getService(MotifProjectService::class.java).refreshGraph { actionPerformed(event) }
+      project.getService(MotifService::class.java).refreshGraph { actionPerformed(event) }
       return
     }
 
     val toolWindow: ToolWindow =
         ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID) ?: return
-    toolWindow.activate {
-      project.getService(MotifProjectService::class.java).onSelectedClass(element)
-    }
+    toolWindow.activate { project.getService(MotifService::class.java).onSelectedClass(element) }
 
     project
-        .getService(AnalyticsProjectService::class.java)
+        .getService(AnalyticsService::class.java)
         .logEvent(MotifAnalyticsActions.USAGE_MENU_CLICK)
   }
 
diff --git a/intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsProjectService.kt b/intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsService.kt
similarity index 95%
rename from intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsProjectService.kt
rename to intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsService.kt
index 62aba5f5..9b0848d3 100644
--- a/intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsProjectService.kt
+++ b/intellij/src/main/kotlin/motif/intellij/analytics/AnalyticsService.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project
 import java.util.UUID
 
 @Service(Service.Level.PROJECT)
-class AnalyticsProjectService(val project: Project) : Disposable {
+class AnalyticsService(val project: Project) : Disposable {
 
   companion object {
     private val LOGGER_EXTENSION_POINT_NAME: ExtensionPointName<MotifAnalyticsLogger> =
diff --git a/intellij/src/main/kotlin/motif/intellij/hierarchy/ErrorHierarchyBrowser.kt b/intellij/src/main/kotlin/motif/intellij/hierarchy/ErrorHierarchyBrowser.kt
index 9a3ffd17..9fbf3ee3 100644
--- a/intellij/src/main/kotlin/motif/intellij/hierarchy/ErrorHierarchyBrowser.kt
+++ b/intellij/src/main/kotlin/motif/intellij/hierarchy/ErrorHierarchyBrowser.kt
@@ -33,7 +33,7 @@ import javax.swing.JTree
 import javax.swing.tree.DefaultMutableTreeNode
 import motif.core.ResolvedGraph
 import motif.errormessage.ErrorMessage
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils.Companion.isRootElement
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_NEXT_SCOPE
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_PREVIOUS_SCOPE
@@ -49,7 +49,7 @@ class ErrorHierarchyBrowser(
     initialGraph: ResolvedGraph,
     private val rootElement: PsiElement,
     private val selectionListener: Listener?
-) : HierarchyBrowserBase(project, rootElement), MotifProjectService.Listener {
+) : HierarchyBrowserBase(project, rootElement), MotifService.Listener {
 
   private var graph: ResolvedGraph = initialGraph
 
@@ -130,7 +130,7 @@ class ErrorHierarchyBrowser(
   }
 
   override fun doRefresh(currentBuilderOnly: Boolean) {
-    project.getService(MotifProjectService::class.java).refreshGraph()
+    project.getService(MotifService::class.java).refreshGraph()
   }
 
   override fun onGraphUpdated(graph: ResolvedGraph) {
diff --git a/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopeHierarchyBrowser.kt b/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopeHierarchyBrowser.kt
index 95bc83d8..6001f3fa 100644
--- a/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopeHierarchyBrowser.kt
+++ b/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopeHierarchyBrowser.kt
@@ -42,10 +42,10 @@ import motif.ast.IrType
 import motif.ast.intellij.IntelliJClass
 import motif.ast.intellij.IntelliJType
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifScopeClass
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 import motif.intellij.hierarchy.descriptor.ScopeHierarchyRootDescriptor
 import motif.intellij.hierarchy.descriptor.ScopeHierarchyScopeAncestorDescriptor
@@ -60,7 +60,7 @@ class ScopeHierarchyBrowser(
     initialGraph: ResolvedGraph,
     private val rootElement: PsiElement,
     private val selectionListener: Listener?
-) : HierarchyBrowserBase(project, rootElement), MotifProjectService.Listener {
+) : HierarchyBrowserBase(project, rootElement), MotifService.Listener {
 
   companion object {
     const val LABEL_GO_PREVIOUS_SCOPE: String = "Go to previous Scope."
@@ -189,12 +189,12 @@ class ScopeHierarchyBrowser(
       else -> {}
     }
 
-    project.getService(MotifProjectService::class.java).refreshGraph()
+    project.getService(MotifService::class.java).refreshGraph()
 
     val action: String =
         if (status == Status.INITIALIZING) MotifAnalyticsActions.GRAPH_INIT
         else MotifAnalyticsActions.GRAPH_UPDATE
-    project.getService(AnalyticsProjectService::class.java).logEvent(action)
+    project.getService(AnalyticsService::class.java).logEvent(action)
   }
 
   /*
diff --git a/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopePropertyHierarchyBrowser.kt b/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopePropertyHierarchyBrowser.kt
index 2847fda1..ae0b7159 100644
--- a/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopePropertyHierarchyBrowser.kt
+++ b/intellij/src/main/kotlin/motif/intellij/hierarchy/ScopePropertyHierarchyBrowser.kt
@@ -41,7 +41,7 @@ import motif.ast.IrType
 import motif.ast.intellij.IntelliJClass
 import motif.ast.intellij.IntelliJType
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifScopeClass
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_NEXT_SCOPE
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_PREVIOUS_SCOPE
@@ -61,7 +61,7 @@ class ScopePropertyHierarchyBrowser(
     initialGraph: ResolvedGraph,
     private val rootElement: PsiElement,
     private val hierarchyType: PropertyHierarchyType
-) : HierarchyBrowserBase(project, rootElement), MotifProjectService.Listener {
+) : HierarchyBrowserBase(project, rootElement), MotifService.Listener {
 
   private var graph: ResolvedGraph = initialGraph
 
diff --git a/intellij/src/main/kotlin/motif/intellij/hierarchy/UsageHierarchyBrowser.kt b/intellij/src/main/kotlin/motif/intellij/hierarchy/UsageHierarchyBrowser.kt
index f537618e..3237ebf8 100644
--- a/intellij/src/main/kotlin/motif/intellij/hierarchy/UsageHierarchyBrowser.kt
+++ b/intellij/src/main/kotlin/motif/intellij/hierarchy/UsageHierarchyBrowser.kt
@@ -30,7 +30,7 @@ import java.text.MessageFormat
 import javax.swing.JPanel
 import javax.swing.JTree
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_NEXT_SCOPE
 import motif.intellij.hierarchy.ScopeHierarchyBrowser.Companion.LABEL_GO_PREVIOUS_SCOPE
 import motif.intellij.hierarchy.descriptor.ScopeHierarchyUsageSectionDescriptor
@@ -42,7 +42,7 @@ class UsageHierarchyBrowser(
     project: Project,
     initialGraph: ResolvedGraph,
     private val rootElement: PsiElement
-) : HierarchyBrowserBase(project, rootElement), MotifProjectService.Listener {
+) : HierarchyBrowserBase(project, rootElement), MotifService.Listener {
 
   private var graph: ResolvedGraph = initialGraph
 
diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt
index 5663298f..a54e0e1b 100644
--- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt
+++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt
@@ -32,17 +32,17 @@ import com.intellij.psi.impl.source.PsiClassReferenceType
 import com.intellij.util.ConstantFunction
 import java.awt.event.MouseEvent
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
-import motif.intellij.MotifProjectService.Companion.TOOL_WINDOW_ID
+import motif.intellij.MotifService
+import motif.intellij.MotifService.Companion.TOOL_WINDOW_ID
 import motif.intellij.ScopeHierarchyUtils.Companion.getParentScopes
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifScopeClass
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 
 /*
  * {@LineMarkerProvider} used to display icon in gutter to navigate to motif scope ancestors hierarchy.
  */
-class ScopeHierarchyLineMarkerProvider : LineMarkerProvider, MotifProjectService.Listener {
+class ScopeHierarchyLineMarkerProvider : LineMarkerProvider, MotifService.Listener {
 
   companion object {
     const val LABEL_ANCESTORS_SCOPE: String = "View Scope Ancestors."
@@ -83,21 +83,19 @@ class ScopeHierarchyLineMarkerProvider : LineMarkerProvider, MotifProjectService
           ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID) ?: return
       if (element is PsiClass) {
         toolWindow.activate {
-          project.getService(MotifProjectService::class.java).onSelectedAncestorScope(element)
+          project.getService(MotifService::class.java).onSelectedAncestorScope(element)
         }
       } else if (element is PsiMethod) {
         if (element.returnType is PsiClassReferenceType) {
           val returnElementClass: PsiClass =
               (element.returnType as PsiClassReferenceType).resolve() ?: return
           toolWindow.activate {
-            project
-                .getService(MotifProjectService::class.java)
-                .onSelectedAncestorScope(returnElementClass)
+            project.getService(MotifService::class.java).onSelectedAncestorScope(returnElementClass)
           }
         }
       }
       project
-          .getService(AnalyticsProjectService::class.java)
+          .getService(AnalyticsService::class.java)
           .logEvent(MotifAnalyticsActions.ANCESTOR_GUTTER_CLICK)
     }
   }
diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt
index 8219066a..b1883155 100644
--- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt
+++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt
@@ -40,11 +40,11 @@ import java.awt.event.MouseEvent
 import motif.ast.intellij.IntelliJClass
 import motif.core.ResolvedGraph
 import motif.core.ScopeEdge
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils.Companion.getParentScopes
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifChildScopeMethod
 import motif.intellij.ScopeHierarchyUtils.Companion.isMotifScopeClass
-import motif.intellij.analytics.AnalyticsProjectService
+import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
 import motif.intellij.toPsiClass
 import motif.intellij.toPsiMethod
@@ -52,7 +52,7 @@ import motif.intellij.toPsiMethod
 /*
  * {@LineMarkerProvider} used to display navigation icons in gutter to navigate to parent/children of Motif scopes.
  */
-class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifProjectService.Listener {
+class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifService.Listener {
 
   companion object {
     const val LABEL_NAVIGATE_PARENT_SCOPE: String = "Navigate to parent Scope."
@@ -158,7 +158,7 @@ class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifProjectServic
         }
       }
       project
-          .getService(AnalyticsProjectService::class.java)
+          .getService(AnalyticsService::class.java)
           .logEvent(MotifAnalyticsActions.NAVIGATION_GUTTER_CLICK)
     }
 
diff --git a/intellij/src/main/kotlin/motif/intellij/ui/MotifErrorPanel.kt b/intellij/src/main/kotlin/motif/intellij/ui/MotifErrorPanel.kt
index dfcffe51..58770d64 100644
--- a/intellij/src/main/kotlin/motif/intellij/ui/MotifErrorPanel.kt
+++ b/intellij/src/main/kotlin/motif/intellij/ui/MotifErrorPanel.kt
@@ -23,13 +23,13 @@ import javax.swing.JSplitPane
 import javax.swing.JTextArea
 import motif.core.ResolvedGraph
 import motif.errormessage.ErrorMessage
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils
 import motif.intellij.hierarchy.ErrorHierarchyBrowser
 import motif.models.MotifError
 
 class MotifErrorPanel(project: Project, graph: ResolvedGraph) :
-    JPanel(), MotifProjectService.Listener, ErrorHierarchyBrowser.Listener {
+    JPanel(), MotifService.Listener, ErrorHierarchyBrowser.Listener {
 
   private val splitPane: JSplitPane
   private val errorBrowser: ErrorHierarchyBrowser
diff --git a/intellij/src/main/kotlin/motif/intellij/ui/MotifScopePanel.kt b/intellij/src/main/kotlin/motif/intellij/ui/MotifScopePanel.kt
index ddc50319..ff443477 100644
--- a/intellij/src/main/kotlin/motif/intellij/ui/MotifScopePanel.kt
+++ b/intellij/src/main/kotlin/motif/intellij/ui/MotifScopePanel.kt
@@ -24,7 +24,7 @@ import javax.swing.JPanel
 import javax.swing.JSplitPane
 import javax.swing.JSplitPane.RIGHT
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils
 import motif.intellij.hierarchy.ScopeHierarchyBrowser
 import motif.intellij.hierarchy.ScopePropertyHierarchyBrowser
@@ -32,7 +32,7 @@ import motif.intellij.hierarchy.ScopePropertyHierarchyBrowser.PropertyHierarchyT
 import motif.models.Scope
 
 class MotifScopePanel(val project: Project, initialGraph: ResolvedGraph) :
-    JPanel(), ScopeHierarchyBrowser.Listener, MotifProjectService.Listener {
+    JPanel(), ScopeHierarchyBrowser.Listener, MotifService.Listener {
 
   private var graph: ResolvedGraph = initialGraph
 
diff --git a/intellij/src/main/kotlin/motif/intellij/ui/MotifUsagePanel.kt b/intellij/src/main/kotlin/motif/intellij/ui/MotifUsagePanel.kt
index 1804cb4f..5c312f51 100644
--- a/intellij/src/main/kotlin/motif/intellij/ui/MotifUsagePanel.kt
+++ b/intellij/src/main/kotlin/motif/intellij/ui/MotifUsagePanel.kt
@@ -21,12 +21,11 @@ import com.intellij.psi.PsiElement
 import java.awt.BorderLayout
 import javax.swing.JPanel
 import motif.core.ResolvedGraph
-import motif.intellij.MotifProjectService
+import motif.intellij.MotifService
 import motif.intellij.ScopeHierarchyUtils
 import motif.intellij.hierarchy.UsageHierarchyBrowser
 
-class MotifUsagePanel(project: Project, graph: ResolvedGraph) :
-    JPanel(), MotifProjectService.Listener {
+class MotifUsagePanel(project: Project, graph: ResolvedGraph) : JPanel(), MotifService.Listener {
 
   private val usageBrowser: UsageHierarchyBrowser
 
diff --git a/intellij/src/main/resources/META-INF/plugin.xml b/intellij/src/main/resources/META-INF/plugin.xml
index 81e9066f..e49bd34a 100644
--- a/intellij/src/main/resources/META-INF/plugin.xml
+++ b/intellij/src/main/resources/META-INF/plugin.xml
@@ -31,7 +31,7 @@
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <backgroundPostStartupActivity implementation="motif.intellij.AttachMotifProjectServiceActivity"/>
+        <backgroundPostStartupActivity implementation="motif.intellij.AttachMotifServiceActivity"/>
     </extensions>
 
     <actions>