diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/kernel/ThreadStatusDataProviderTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/kernel/ThreadStatusDataProviderTest.java
index 9843424997..c3167a46bf 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/kernel/ThreadStatusDataProviderTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/kernel/ThreadStatusDataProviderTest.java
@@ -46,6 +46,7 @@
 import org.eclipse.tracecompass.tmf.core.response.ITmfResponse;
 import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal;
+import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.junit.Test;
 
@@ -75,7 +76,7 @@ public void testThreadStatusDataProvider() throws TmfTraceException, IOException
             trace.initTrace(null, filePath.toOSString(), TmfEvent.class);
             trace.traceOpened(new TmfTraceOpenedSignal(this, trace, null));
 
-            KernelAnalysisModule module = TmfTraceUtils.getAnalysisModuleOfClass(trace, KernelAnalysisModule.class, KernelAnalysisModule.ID);
+            TmfStateSystemAnalysisModule module = TmfTraceUtils.getAnalysisModuleOfClass(trace, TmfStateSystemAnalysisModule.class, KernelAnalysisModule.ID);
             assertNotNull(module);
             assertTrue(module.schedule().isOK());
             assertTrue(module.waitForCompletion());
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java
index 9ce4b3f5cc..82f294d4fd 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java
@@ -32,7 +32,6 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect;
-import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.OsStrings;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.ProcessStatus;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
@@ -79,6 +78,7 @@
 import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeModel;
 import org.eclipse.tracecompass.tmf.core.response.ITmfResponse;
 import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse;
+import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.eclipse.tracecompass.tmf.core.util.Pair;
@@ -146,7 +146,7 @@ public class ThreadStatusDataProvider extends AbstractTmfTraceDataProvider imple
         STATE_MAP = builder.build();
     }
 
-    private final KernelAnalysisModule fModule;
+    private final TmfStateSystemAnalysisModule fModule;
     private final long fTraceId = fAtomicLong.getAndIncrement();
 
     /**
@@ -186,11 +186,11 @@ public class ThreadStatusDataProvider extends AbstractTmfTraceDataProvider imple
      * @param trace
      *            The trace for which this provider will be built.
      * @param module
-     *            the {@link KernelAnalysisModule} to access the underlying
+     *            the {@link TmfStateSystemAnalysisModule} to access the underlying
      *            {@link ITmfStateSystem}
      *
      */
-    public ThreadStatusDataProvider(@NonNull ITmfTrace trace, KernelAnalysisModule module) {
+    public ThreadStatusDataProvider(@NonNull ITmfTrace trace, TmfStateSystemAnalysisModule module) {
         super(trace);
         fModule = module;
         fEventAnnotationProvider = new EventAnnotationProvider<>(OsStrings.tid(), (unused -> true), (candidate) -> !(candidate instanceof IKernelTrace) && trace != candidate, LinuxTidAspect.class, trace,