diff --git a/lib/grammars/c.js b/lib/grammars/c.js
index cf9a4d93..3ee8f4ca 100644
--- a/lib/grammars/c.js
+++ b/lib/grammars/c.js
@@ -55,7 +55,7 @@ const Cs = {
       if (windows) {
         return [`/c csc /out:${exe} ${tmpFile} && ${exe}`]
       } else {
-        return ["-c", `csc /out:${exe} ${tmpFile} && mono ${exe}`]
+        return ["-c", `csc /out:${exe} ${tmpFile} && dotnet ${exe}`]
       }
     },
   },
@@ -66,24 +66,24 @@ const Cs = {
       if (windows) {
         return [`/c csc ${filepath} && ${exe}`]
       } else {
-        return ["-c", `csc '${filepath}' && mono ${exe}`]
+        return ["-c", `csc '${filepath}' && dotnet ${exe}`]
       }
     },
   },
 }
 const CSScriptFile = {
   "Selection Based": {
-    command: "scriptcs",
+    command: "dotnet",
     args(context) {
       const code = context.getCode()
       const tmpFile = GrammarUtils.createTempFileWithCode(code, ".csx")
-      return ["-script", tmpFile]
+      return ["script", tmpFile]
     },
   },
   "File Based": {
-    command: "scriptcs",
+    command: "dotnet",
     args({ filepath }) {
-      return ["-script", filepath]
+      return ["script", filepath]
     },
   },
 }
diff --git a/lib/grammars/index.js b/lib/grammars/index.js
index ea406212..23897834 100644
--- a/lib/grammars/index.js
+++ b/lib/grammars/index.js
@@ -118,9 +118,9 @@ const OtherGrammars = {
 
   "F#": {
     "File Based": {
-      command: windows ? "fsi" : "fsharpi",
+      command: windows ? "fsi" : "dotnet",
       args({ filepath }) {
-        return ["--exec", filepath]
+        return windows ? ["--exec", filepath] : ["fsi", "--exec", filepath]
       },
     },
   },