diff --git a/src/Scripting/CSharp/CSharpScript.cs b/src/Scripting/CSharp/CSharpScript.cs
index 1e69c689db14000419a23a033e885c2bb0feee49..58c82d339010dcc1916b62e7ae6b35e147e2aee1 100644
--- a/src/Scripting/CSharp/CSharpScript.cs
+++ b/src/Scripting/CSharp/CSharpScript.cs
@@ -31,14 +31,16 @@ public static Script<T> Create<T>(string code, ScriptOptions options = null, Typ
         /// <summary>
         /// Create a new C# script.
         /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> representing the source code of the script.</param>
+        /// <param name="code">The <see cref="Stream"/> representing the source code of the script.</param>
         /// <param name="options">The script options.</param>
         /// <param name="globalsType">Type of global object.</param>
         /// <param name="assemblyLoader">Custom  assembly loader.</param>
         /// <typeparam name="T">The return type of the script</typeparam>
-        public static Script<T> Create<T>(Stream stream, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
+        /// <exception cref="ArgumentNullException">Stream is null.</exception>
+        /// <exception cref="ArgumentException">Stream is not readable or seekable.</exception>
+        public static Script<T> Create<T>(Stream code, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
         {
-            return Script.CreateInitialScript<T>(CSharpScriptCompiler.Instance, stream, options, globalsType, assemblyLoader);
+            return Script.CreateInitialScript<T>(CSharpScriptCompiler.Instance, code, options, globalsType, assemblyLoader);
         }
 
         /// <summary>
@@ -57,13 +59,15 @@ public static Script<object> Create(string code, ScriptOptions options = null, T
         /// <summary>
         /// Create a new C# script.
         /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> representing the source code of the script.</param>
+        /// <param name="code">The <see cref="Stream"/> representing the source code of the script.</param>
         /// <param name="options">The script options.</param>
         /// <param name="globalsType">Type of global object.</param>
         /// <param name="assemblyLoader">Custom  assembly loader.</param>
-        public static Script<object> Create(Stream stream, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
+        /// <exception cref="ArgumentNullException">Stream is null.</exception>
+        /// <exception cref="ArgumentException">Stream is not readable or seekable.</exception>
+        public static Script<object> Create(Stream code, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
         {
-            return Create<object>(stream, options, globalsType, assemblyLoader);
+            return Create<object>(code, options, globalsType, assemblyLoader);
         }
 
         /// <summary>
diff --git a/src/Scripting/CSharp/PublicAPI.Unshipped.txt b/src/Scripting/CSharp/PublicAPI.Unshipped.txt
index 8b6efd197e2dcc459420accab247909fde739723..3b3b39acca0ca79edefb6cb7fb3d6425317b9d18 100644
--- a/src/Scripting/CSharp/PublicAPI.Unshipped.txt
+++ b/src/Scripting/CSharp/PublicAPI.Unshipped.txt
@@ -1,2 +1,2 @@
-static Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.Create(System.IO.Stream stream, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<object>
-static Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.Create<T>(System.IO.Stream stream, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<T>
\ No newline at end of file
+static Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.Create(System.IO.Stream code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<object>
+static Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.Create<T>(System.IO.Stream code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null, System.Type globalsType = null, Microsoft.CodeAnalysis.Scripting.Hosting.InteractiveAssemblyLoader assemblyLoader = null) -> Microsoft.CodeAnalysis.Scripting.Script<T>
\ No newline at end of file
diff --git a/src/Scripting/Core/PublicAPI.Unshipped.txt b/src/Scripting/Core/PublicAPI.Unshipped.txt
index 81784da4fc3c66294dd5612952067d85a15bdfad..bf60c2a3b9f148c4d0080b6c40bfc539456757ac 100644
--- a/src/Scripting/Core/PublicAPI.Unshipped.txt
+++ b/src/Scripting/Core/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
-Microsoft.CodeAnalysis.Scripting.Script.ContinueWith(System.IO.Stream stream, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null) -> Microsoft.CodeAnalysis.Scripting.Script<object>
-Microsoft.CodeAnalysis.Scripting.Script.ContinueWith<TResult>(System.IO.Stream stream, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null) -> Microsoft.CodeAnalysis.Scripting.Script<TResult>
+Microsoft.CodeAnalysis.Scripting.Script.ContinueWith(System.IO.Stream code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null) -> Microsoft.CodeAnalysis.Scripting.Script<object>
+Microsoft.CodeAnalysis.Scripting.Script.ContinueWith<TResult>(System.IO.Stream code, Microsoft.CodeAnalysis.Scripting.ScriptOptions options = null) -> Microsoft.CodeAnalysis.Scripting.Script<TResult>
 Microsoft.CodeAnalysis.Scripting.Script.SourceText.get -> Microsoft.CodeAnalysis.Text.SourceText
 Microsoft.CodeAnalysis.Scripting.ScriptOptions.EmitDebugInformation.get -> bool
 Microsoft.CodeAnalysis.Scripting.ScriptOptions.FileEncoding.get -> System.Text.Encoding
diff --git a/src/Scripting/Core/Script.cs b/src/Scripting/Core/Script.cs
index 43f9b437447269097bb3b5a4dd4184085e90fe8b..abbfaab57657e24080aca25dc99198a9758806b4 100644
--- a/src/Scripting/Core/Script.cs
+++ b/src/Scripting/Core/Script.cs
@@ -49,9 +49,9 @@ internal static Script<T> CreateInitialScript<T>(ScriptCompiler compiler, string
             return new Script<T>(compiler, new ScriptBuilder(assemblyLoaderOpt ?? new InteractiveAssemblyLoader()), codeOpt ?? "", optionsOpt ?? ScriptOptions.Default, globalsTypeOpt, previousOpt: null);
         }
 
-        internal static Script<T> CreateInitialScript<T>(ScriptCompiler compiler, Stream stream, ScriptOptions optionsOpt, Type globalsTypeOpt, InteractiveAssemblyLoader assemblyLoaderOpt)
+        internal static Script<T> CreateInitialScript<T>(ScriptCompiler compiler, Stream code, ScriptOptions optionsOpt, Type globalsTypeOpt, InteractiveAssemblyLoader assemblyLoaderOpt)
         {
-            return new Script<T>(compiler, new ScriptBuilder(assemblyLoaderOpt ?? new InteractiveAssemblyLoader()), stream, optionsOpt ?? ScriptOptions.Default, globalsTypeOpt, previousOpt: null);
+            return new Script<T>(compiler, new ScriptBuilder(assemblyLoaderOpt ?? new InteractiveAssemblyLoader()), code, optionsOpt ?? ScriptOptions.Default, globalsTypeOpt, previousOpt: null);
         }
 
         /// <summary>
@@ -102,8 +102,10 @@ internal static Script<T> CreateInitialScript<T>(ScriptCompiler compiler, Stream
         /// <summary>
         /// Continues the script with given <see cref="Stream"/> representing code.
         /// </summary>
-        public Script<object> ContinueWith(Stream stream, ScriptOptions options = null) =>
-            ContinueWith<object>(stream, options);
+        /// <exception cref="ArgumentNullException">Stream is null.</exception>
+        /// <exception cref="ArgumentException">Stream is not readable or seekable.</exception>
+        public Script<object> ContinueWith(Stream code, ScriptOptions options = null) =>
+            ContinueWith<object>(code, options);
 
         /// <summary>
         /// Continues the script with given code snippet.
@@ -115,8 +117,10 @@ internal static Script<T> CreateInitialScript<T>(ScriptCompiler compiler, Stream
         /// <summary>
         /// Continues the script with given <see cref="Stream"/> representing code.
         /// </summary>
-        public Script<TResult> ContinueWith<TResult>(Stream stream, ScriptOptions options = null) =>
-            new Script<TResult>(Compiler, Builder, stream, options ?? InheritOptions(Options), GlobalsType, this);
+        /// <exception cref="ArgumentNullException">Stream is null.</exception>
+        /// <exception cref="ArgumentException">Stream is not readable or seekable.</exception>
+        public Script<TResult> ContinueWith<TResult>(Stream code, ScriptOptions options = null) =>
+            new Script<TResult>(Compiler, Builder, code, options ?? InheritOptions(Options), GlobalsType, this);
 
         private static ScriptOptions InheritOptions(ScriptOptions previous)
         {
@@ -309,8 +313,8 @@ internal Script(ScriptCompiler compiler, ScriptBuilder builder, string code, Scr
         {
         }
 
-        internal Script(ScriptCompiler compiler, ScriptBuilder builder, Stream stream, ScriptOptions options, Type globalsTypeOpt, Script previousOpt)
-            : base(compiler, builder, SourceText.From(stream, options.FileEncoding), options, globalsTypeOpt, previousOpt)
+        internal Script(ScriptCompiler compiler, ScriptBuilder builder, Stream code, ScriptOptions options, Type globalsTypeOpt, Script previousOpt)
+            : base(compiler, builder, SourceText.From(code, options.FileEncoding), options, globalsTypeOpt, previousOpt)
         {
         }