diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index ba73533790..f34cd5a14f 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.StaticFiles;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.Logging.Console;
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
index e5bb73a6ad..96d98217e1 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesMiddleware.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.StaticFiles
         /// <param name="options">The configuration options for this middleware.</param>
         public DefaultFilesMiddleware([NotNull] RequestDelegate next, [NotNull] IHostingEnvironment hostingEnv, [NotNull] DefaultFilesOptions options)
         {
-            options.ResolveFileSystem(hostingEnv);
+            options.ResolveFileProvider(hostingEnv);
 
             _next = next;
             _options = options;
@@ -47,14 +47,14 @@ namespace Microsoft.AspNet.StaticFiles
             if (Helpers.IsGetOrHeadMethod(context.Request.Method)
                 && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out subpath))
             {
-                var dirContents = _options.FileSystem.GetDirectoryContents(subpath.Value);
+                var dirContents = _options.FileProvider.GetDirectoryContents(subpath.Value);
                 if (dirContents.Exists)
                 {
                     // Check if any of our default files exist.
                     for (int matchIndex = 0; matchIndex < _options.DefaultFileNames.Count; matchIndex++)
                     {
                         string defaultFile = _options.DefaultFileNames[matchIndex];
-                        var file = _options.FileSystem.GetFileInfo(subpath + defaultFile);
+                        var file = _options.FileProvider.GetFileInfo(subpath + defaultFile);
                         // TryMatchPath will make sure subpath always ends with a "/" by adding it if needed.
                         if (file.Exists)
                         {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
index 3a4e1a0150..45fd61764f 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.Net.Http.Headers;
@@ -31,7 +31,7 @@ namespace Microsoft.AspNet.StaticFiles
             {
                 throw new ArgumentException(Resources.Args_NoFormatter);
             }
-            options.ResolveFileSystem(hostingEnv);
+            options.ResolveFileProvider(hostingEnv);
 
             _next = next;
             _options = options;
@@ -69,7 +69,7 @@ namespace Microsoft.AspNet.StaticFiles
 
         private bool TryGetDirectoryInfo(PathString subpath, out IDirectoryContents contents)
         {
-            contents = _options.FileSystem.GetDirectoryContents(subpath.Value);
+            contents = _options.FileProvider.GetDirectoryContents(subpath.Value);
             return contents.Exists;
         }
     }
diff --git a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
index ba9e6bd17a..09803b93d3 100644
--- a/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/HtmlDirectoryFormatter.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
index b0eab0589b..c30bdb9dc3 100644
--- a/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
+++ b/src/Microsoft.AspNet.StaticFiles/IDirectoryFormatter.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
index 936ae0f534..e2e7a0b050 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles.Infrastructure
@@ -41,6 +41,6 @@ namespace Microsoft.AspNet.StaticFiles.Infrastructure
         /// <summary>
         /// The file system used to locate resources
         /// </summary>
-        public IFileSystem FileSystem { get; set; }
+        public IFileProvider FileProvider { get; set; }
     }
 }
diff --git a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
index 27f69fb0e8..2c1942ec4a 100644
--- a/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
+++ b/src/Microsoft.AspNet.StaticFiles/Infrastructure/SharedOptionsBase.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 
@@ -45,20 +45,20 @@ namespace Microsoft.AspNet.StaticFiles.Infrastructure
         /// <summary>
         /// The file system used to locate resources
         /// </summary>
-        public IFileSystem FileSystem
+        public IFileProvider FileProvider
         {
-            get { return SharedOptions.FileSystem; }
-            set { SharedOptions.FileSystem = value; }
+            get { return SharedOptions.FileProvider; }
+            set { SharedOptions.FileProvider = value; }
         }
 
-        internal void ResolveFileSystem(IHostingEnvironment hostingEnv)
+        internal void ResolveFileProvider(IHostingEnvironment hostingEnv)
         {
-            if (FileSystem == null)
+            if (FileProvider == null)
             {
-                FileSystem = hostingEnv.WebRootFileSystem;
-                if (FileSystem == null)
+                FileProvider = hostingEnv.WebRootFileProvider;
+                if (FileProvider == null)
                 {
-                    throw new InvalidOperationException("Missing FileSystem.");
+                    throw new InvalidOperationException("Missing FileProvider.");
                 }
             }
         }
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
index 74baa93f8a..4ddafcbf42 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Headers;
 using Microsoft.AspNet.Http.Interfaces;
@@ -127,7 +127,7 @@ namespace Microsoft.AspNet.StaticFiles
 
         public bool LookupFileInfo()
         {
-            _fileInfo = _options.FileSystem.GetFileInfo(_subPath.Value);
+            _fileInfo = _options.FileProvider.GetFileInfo(_subPath.Value);
             if (_fileInfo.Exists)
             {
                 _length = _fileInfo.Length;
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
index a9c09d84b3..12ab4c0933 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileMiddleware.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.Logging;
@@ -33,7 +33,7 @@ namespace Microsoft.AspNet.StaticFiles
             {
                 throw new ArgumentException(Resources.Args_NoContentTypeProvider);
             }
-            options.ResolveFileSystem(hostingEnv);
+            options.ResolveFileProvider(hostingEnv);
 
             _next = next;
             _options = options;
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
index 9a643e6b45..71208d311d 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileResponseContext.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.StaticFiles
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
index 89f5ed3775..aa40c6eb1c 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.TestHost;
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.StaticFiles
         public async Task NullArguments()
         {
             // No exception, default provided
-            TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions() { FileSystem = null }));
+            TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions() { FileProvider = null }));
 
             // PathString(null) is OK.
             TestServer server = TestServer.Create(app => app.UseDefaultFiles((string)null));
@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.StaticFiles
                 app.UseDefaultFiles(new DefaultFilesOptions()
                 {
                     RequestPath = new PathString(baseUrl),
-                    FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                    FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
                 });
                 app.Run(context => context.Response.WriteAsync(context.Request.Path.Value));
             });
@@ -63,7 +63,7 @@ namespace Microsoft.AspNet.StaticFiles
                 app.UseDefaultFiles(new DefaultFilesOptions()
                 {
                     RequestPath = new PathString(baseUrl),
-                    FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                    FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
                 });
                 app.Run(context => context.Response.WriteAsync(context.Request.Path.Value));
             });
@@ -81,11 +81,11 @@ namespace Microsoft.AspNet.StaticFiles
         {
             TestServer server = TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions()
             {
-                RequestPath = new PathString(baseUrl),                
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                RequestPath = new PathString(baseUrl),
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
-            
+
             Assert.Equal(HttpStatusCode.Moved, response.StatusCode);
             Assert.Equal(requestUrl + "/" + queryString, response.Headers.Location.ToString());
             Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
@@ -101,7 +101,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
 
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
index 917dad4bc2..eede055611 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Xunit;
@@ -22,7 +22,7 @@ namespace Microsoft.AspNet.StaticFiles
             Assert.Throws<ArgumentException>(() => TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { Formatter = null })));
 
             // No exception, default provided
-            TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileSystem = null }));
+            TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileProvider = null }));
 
             // PathString(null) is OK.
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser((string)null));
@@ -40,8 +40,8 @@ namespace Microsoft.AspNet.StaticFiles
         {
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
             {
-                RequestPath = new PathString(baseUrl), 
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                RequestPath = new PathString(baseUrl),
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -58,7 +58,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
 
@@ -80,7 +80,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
 
@@ -99,7 +99,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).PostAsync();
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -115,7 +115,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).SendAsync("HEAD");
 
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs
index 05a30f7c1b..8602779a7c 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileContextTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Core;
 using Microsoft.Framework.Expiration.Interfaces;
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.StaticFiles
         {
             // Arrange
             var options = new StaticFileOptions();
-            options.FileSystem = new TestFileSystem();
+            options.FileProvider = new TestFileProvider();
             var context = new StaticFileContext(new DefaultHttpContext(), options, PathString.Empty, NullLogger.Instance);
 
             // Act
@@ -37,12 +37,12 @@ namespace Microsoft.AspNet.StaticFiles
         {
             // Arrange
             var options = new StaticFileOptions();
-            var fileSystem = new TestFileSystem();
-            fileSystem.AddFile("/foo.txt", new TestFileInfo
+            var fileProvider = new TestFileProvider();
+            fileProvider.AddFile("/foo.txt", new TestFileInfo
             {
                 LastModified = new DateTimeOffset(2014, 1, 2, 3, 4, 5, TimeSpan.Zero)
             });
-            options.FileSystem = fileSystem;
+            options.FileProvider = fileProvider;
             var pathString = new PathString("/test");
             var httpContext = new DefaultHttpContext();
             httpContext.Request.Path = new PathString("/test/foo.txt");
@@ -56,7 +56,7 @@ namespace Microsoft.AspNet.StaticFiles
             Assert.True(result);
         }
 
-        private sealed class TestFileSystem : IFileSystem
+        private sealed class TestFileProvider : IFileProvider
         {
             private readonly Dictionary<string, IFileInfo> _files = new Dictionary<string, IFileInfo>(StringComparer.Ordinal);
 
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index 2c18574114..60bb172036 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.FileSystems;
+using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Xunit;
@@ -22,7 +22,7 @@ namespace Microsoft.AspNet.StaticFiles
             Assert.Throws<ArgumentException>(() => TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions() { ContentTypeProvider = null })));
 
             // No exception, default provided
-            TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions() { FileSystem = null }));
+            TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions() { FileProvider = null }));
 
             // PathString(null) is OK.
             TestServer server = TestServer.Create(app => app.UseStaticFiles((string)null));
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -58,7 +58,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
 
@@ -80,7 +80,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).PostAsync();
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@@ -98,7 +98,7 @@ namespace Microsoft.AspNet.StaticFiles
             TestServer server = TestServer.Create(app => app.UseStaticFiles(new StaticFileOptions()
             {
                 RequestPath = new PathString(baseUrl),
-                FileSystem = new PhysicalFileSystem(Path.Combine(Environment.CurrentDirectory, baseDir))
+                FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
             }));
             HttpResponseMessage response = await server.CreateRequest(requestUrl).SendAsync("HEAD");