diff --git a/rider-fsharp/build.gradle.kts b/rider-fsharp/build.gradle.kts
index 743a2e6ac6..a358d0fce5 100644
--- a/rider-fsharp/build.gradle.kts
+++ b/rider-fsharp/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
     bundledModule("intellij.platform.langInjection")
     bundledPlugin("org.jetbrains.plugins.textmate")
     bundledPlugin("rider.intellij.plugin.appender")
-    bundledPlugin("com.intellij.moduleSet.structureView")
+    bundledPlugin("intellij.structureView.plugin")
     bundledModule("intellij.resharper.assist")
     instrumentationTools()
     // TODO: Temporary I hope hope hope
diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiProcessHandler.kt b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiProcessHandler.kt
index 0d61ba6e4c..725530f288 100644
--- a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiProcessHandler.kt
+++ b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiProcessHandler.kt
@@ -3,7 +3,7 @@ package com.jetbrains.rider.plugins.fsharp.services.fsi
 import com.intellij.execution.process.OSProcessHandler
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessListener
-import com.intellij.execution.process.ProcessOutputTypes
+import com.intellij.execution.process.ProcessOutputType
 import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.rd.util.launchOnUi
 import com.intellij.openapi.util.Key
@@ -36,12 +36,12 @@ internal class FsiProcessHandler(
     lifetime.launchOnUi {
       it.consumeEach { (text, outputType) ->
         if (text != "> ") {
-          when (outputType) {
-            ProcessOutputTypes.STDOUT -> {
+          when {
+            ProcessOutputType.isStdout(outputType) -> {
               fsiInputOutputProcessor.printOutputText(text, ConsoleViewContentType.NORMAL_OUTPUT)
             }
 
-            ProcessOutputTypes.STDERR -> {
+            ProcessOutputType.isStderr(outputType) -> {
               fsiInputOutputProcessor.printOutputText(text, ConsoleViewContentType.ERROR_OUTPUT)
             }
           }
@@ -56,9 +56,8 @@ internal class FsiProcessHandler(
   }
 
   override fun notifyTextAvailable(text: String, outputType: Key<*>) {
-    when (outputType) {
-      ProcessOutputTypes.STDOUT,
-      ProcessOutputTypes.STDERR -> {
+    when {
+      ProcessOutputType.isStdout(outputType) || ProcessOutputType.isStderr(outputType) -> {
         ThreadingAssertions.assertBackgroundThread()
         channel.trySendBlocking(text to outputType)
       }
diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiSandboxInfoUpdater.kt b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiSandboxInfoUpdater.kt
index e7b20a31d5..95a02a4df1 100644
--- a/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiSandboxInfoUpdater.kt
+++ b/rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/fsi/FsiSandboxInfoUpdater.kt
@@ -91,7 +91,7 @@ class FsiSandboxInfoUpdater(
   fun onOutputEnd() {
     if (!ProcessOutputType.isSystem(fsiProcessOutputListener.lastOutputType)) {
       verifiedCommandNumber += 1
-      if (fsiProcessOutputListener.lastOutputType == ProcessOutputTypes.STDOUT) {
+      if (ProcessOutputType.isStdout(fsiProcessOutputListener.lastOutputType)) {
         correctCommandNumbers.add(verifiedCommandNumber)
 
         updateSandboxInfo()
@@ -106,7 +106,7 @@ class FsiSandboxInfoUpdater(
     var lastOutputType: Key<*> = ProcessOutputTypes.SYSTEM
 
     override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
-      if (outputType == ProcessOutputTypes.STDOUT && !ProcessOutputType.isSystem(lastOutputType))
+      if (ProcessOutputType.isStdout(outputType) && !ProcessOutputType.isSystem(lastOutputType))
         lastOutputType = ProcessOutputTypes.STDOUT
     }
 
diff --git a/rider-fsharp/src/main/resources/META-INF/plugin.xml b/rider-fsharp/src/main/resources/META-INF/plugin.xml
index ac3f13ff42..a25bda4532 100644
--- a/rider-fsharp/src/main/resources/META-INF/plugin.xml
+++ b/rider-fsharp/src/main/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
   <depends>com.intellij.modules.rider</depends>
   <depends>rider.intellij.plugin.appender</depends>
   <depends>com.intellij.rider.rdclient.spellchecker</depends>
-  <depends>com.intellij.moduleSet.structureView</depends>
+  <depends>intellij.structureView.plugin</depends>
 
   <content>
     <module name="intellij.rider.plugins.fsharp.injections" />