diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index d0712951b2..15ebd62693 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -6,7 +6,7 @@ namespace StaticFilesSample
 {
     public class Startup
     {
-        public void Configuration(IBuilder app)
+        public void Configuration(IApplicationBuilder app)
         {
             app.UseFileServer(new FileServerOptions()
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
index d3c2f329d2..2f29be25ac 100644
--- a/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DefaultFilesExtensions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Builder
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IBuilder UseDefaultFiles(this IBuilder builder)
+        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder)
         {
             return builder.UseDefaultFiles(new DefaultFilesOptions());
         }
@@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IBuilder UseDefaultFiles(this IBuilder builder, string requestPath)
+        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, string requestPath)
         {
             return UseDefaultFiles(builder, new DefaultFilesOptions() { RequestPath = new PathString(requestPath) });
         }
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IBuilder UseDefaultFiles(this IBuilder builder, DefaultFilesOptions options)
+        public static IApplicationBuilder UseDefaultFiles(this IApplicationBuilder builder, DefaultFilesOptions options)
         {
             if (builder == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
index f5111bde4f..dbd83c0970 100644
--- a/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/DirectoryBrowserExtensions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Builder
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IBuilder UseDirectoryBrowser(this IBuilder builder)
+        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder)
         {
             return builder.UseDirectoryBrowser(new DirectoryBrowserOptions());
         }
@@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IBuilder UseDirectoryBrowser(this IBuilder builder, string requestPath)
+        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder, string requestPath)
         {
             return UseDirectoryBrowser(builder, new DirectoryBrowserOptions() { RequestPath = new PathString(requestPath) });
         }
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IBuilder UseDirectoryBrowser(this IBuilder builder, DirectoryBrowserOptions options)
+        public static IApplicationBuilder UseDirectoryBrowser(this IApplicationBuilder builder, DirectoryBrowserOptions options)
         {
             if (builder == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
index 90b76f0997..d7fe812218 100644
--- a/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/FileServerExtensions.cs
@@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Builder
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IBuilder UseFileServer(this IBuilder builder)
+        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder)
         {
             return UseFileServer(builder, new FileServerOptions());
         }
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="enableDirectoryBrowsing">Should directory browsing be enabled?</param>
         /// <returns></returns>
-        public static IBuilder UseFileServer(this IBuilder builder, bool enableDirectoryBrowsing)
+        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, bool enableDirectoryBrowsing)
         {
             return UseFileServer(builder, new FileServerOptions() { EnableDirectoryBrowsing = enableDirectoryBrowsing });
         }
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IBuilder UseFileServer(this IBuilder builder, string requestPath)
+        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, string requestPath)
         {
             return UseFileServer(builder, new FileServerOptions() { RequestPath = new PathString(requestPath) });
         }
@@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IBuilder UseFileServer(this IBuilder builder, FileServerOptions options)
+        public static IApplicationBuilder UseFileServer(this IApplicationBuilder builder, FileServerOptions options)
         {
             if (options == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
index 42ed29d2b7..2248ea2053 100644
--- a/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/SendFileExtensions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.StaticFiles
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IBuilder UseSendFileFallback(this IBuilder builder)
+        public static IApplicationBuilder UseSendFileFallback(this IApplicationBuilder builder)
         {
             if (builder == null)
             {
diff --git a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
index c38fe2bb69..a514870f08 100644
--- a/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
+++ b/src/Microsoft.AspNet.StaticFiles/StaticFileExtensions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Builder
         /// </summary>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IBuilder UseStaticFiles(this IBuilder builder)
+        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder)
         {
             return UseStaticFiles(builder, new StaticFileOptions());
         }
@@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="requestPath">The relative request path and physical path.</param>
         /// <returns></returns>
-        public static IBuilder UseStaticFiles(this IBuilder builder, string requestPath)
+        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder, string requestPath)
         {
             return UseStaticFiles(builder, new StaticFileOptions() { RequestPath = new PathString(requestPath) });
         }
@@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Builder
         /// <param name="builder"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public static IBuilder UseStaticFiles(this IBuilder builder, StaticFileOptions options)
+        public static IApplicationBuilder UseStaticFiles(this IApplicationBuilder builder, StaticFileOptions options)
         {
             if (builder == null)
             {