Add 'Apache' and 'IIS' to internal namespaces and classes

.gitignore

@@ -27,4 +27,7 @@ project.lock.json
 *.ipch
 .vs/
 .build/
-.testPublish/
+.testPublish/
+.idea/
+.vscode/
+

src/Microsoft.AspNetCore.Rewrite/ApacheModRewriteOptionsExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 
 namespace Microsoft.AspNetCore.Rewrite
 {

src/Microsoft.AspNetCore.Rewrite/IISUrlRewriteOptionsExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 
 namespace Microsoft.AspNetCore.Rewrite
 {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ApacheModRewriteRule.cs

@@ -4,15 +4,15 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Rewrite.Logging;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
-    public class ModRewriteRule : Rule
+    public class ApacheModRewriteRule : Rule
     {
         public UrlMatch InitialMatch { get; }
         public IList<Condition> Conditions { get; }
         public IList<UrlAction> Actions { get; }
 
-        public ModRewriteRule(UrlMatch initialMatch, IList<Condition> conditions, IList<UrlAction> urlActions)
+        public ApacheModRewriteRule(UrlMatch initialMatch, IList<Condition> conditions, IList<UrlAction> urlActions)
         {
             Conditions = conditions;
             InitialMatch = initialMatch;

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionPatternParser.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     /// <summary>
     /// Parses the "CondPattern" portion of the RewriteCond. 

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ConditionType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public enum ConditionType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FileParser.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public class FileParser
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagParser.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public class FlagParser
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/FlagType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public enum FlagType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Flags.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     // For more information of flags, and what flags we currently support:
     // https://github.com/aspnet/BasicMiddleware/issues/66

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/OperationType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public enum OperationType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ParsedModRewriteCondition.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public class ParsedModRewriteInput
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleBuilder.cs

@@ -7,7 +7,7 @@ using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlActions;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlMatches;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public class RuleBuilder
     {
@@ -17,13 +17,13 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
 
         private readonly TimeSpan RegexTimeout = TimeSpan.FromMilliseconds(1);
 
-        public ModRewriteRule Build()
+        public ApacheModRewriteRule Build()
         {
             if (_actions.Count == 0 || _match == null)
             {
                 throw new InvalidOperationException("Cannot create ModRewriteRule without action and match");
             }
-            return new ModRewriteRule(_match, _conditions, _actions);
+            return new ApacheModRewriteRule(_match, _conditions, _actions);
         }
 
         public void AddRule(string rule)

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/RuleRegexParser.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public class RuleRegexParser
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/SegmentType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     public enum SegmentType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/ServerVariables.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     /// <summary>
     /// mod_rewrite lookups for specific string constants.

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/TestStringParser.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     /// <summary>
     /// Parses the TestString segment of the mod_rewrite condition.

src/Microsoft.AspNetCore.Rewrite/Internal/ApacheModRewrite/Tokenizer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.ModRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite
 {
     /// <summary>
     /// Tokenizes a mod_rewrite rule, delimited by spaces.

src/Microsoft.AspNetCore.Rewrite/Internal/DelegateRule.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.CodeRules
+namespace Microsoft.AspNetCore.Rewrite.Internal
 {
     public class DelegateRule : Rule
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ActionType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public enum ActionType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/IISUrlRewriteRule.cs

@@ -5,16 +5,16 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite.Logging;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
-    public class UrlRewriteRule : Rule
+    public class IISUrlRewriteRule : Rule
     {
         public string Name { get; }
         public UrlMatch InitialMatch { get; }
         public IList<Condition> Conditions { get; }
         public UrlAction Action { get; }
 
-        public UrlRewriteRule(string name,
+        public IISUrlRewriteRule(string name,
             UrlMatch initialMatch,
             IList<Condition> conditions,
             UrlAction action)

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/InputParser.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public class InputParser
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/LogicalGrouping.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public enum LogicalGrouping
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/MatchType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public enum MatchType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/PatternSyntax.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public enum PatternSyntax
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RedirectType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public enum RedirectType
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/RewriteTags.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public static class RewriteTags
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/ServerVariables.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public static class ServerVariables
     {

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteFileParser.cs

@@ -8,20 +8,20 @@ using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public class UrlRewriteFileParser
     {
         private readonly InputParser _inputParser = new InputParser();
 
-        public IList<UrlRewriteRule> Parse(TextReader reader)
+        public IList<IISUrlRewriteRule> Parse(TextReader reader)
         {
             var xmlDoc = XDocument.Load(reader, LoadOptions.SetLineInfo);
             var xmlRoot = xmlDoc.Descendants(RewriteTags.Rewrite).FirstOrDefault();
 
             if (xmlRoot != null)
             {
-                var result = new List<UrlRewriteRule>();
+                var result = new List<IISUrlRewriteRule>();
                 // TODO Global rules are currently not treated differently than normal rules, fix. 
                 // See: https://github.com/aspnet/BasicMiddleware/issues/59
                 ParseRules(xmlRoot.Descendants(RewriteTags.GlobalRules).FirstOrDefault(), result);
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
             return null;
         }
 
-        private void ParseRules(XElement rules, IList<UrlRewriteRule> result)
+        private void ParseRules(XElement rules, IList<IISUrlRewriteRule> result)
         {
             if (rules == null)
             {
@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
             {
                 var builder = new UrlRewriteRuleBuilder();
                 ParseRuleAttributes(rule, builder);
-                
+
                 if (builder.Enabled)
                 {
                     result.Add(builder.Build());
@@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
             LogicalGrouping grouping;
             if (!Enum.TryParse(conditions.Attribute(RewriteTags.MatchType)?.Value, out grouping))
             {
-                 grouping = LogicalGrouping.MatchAll;
+                grouping = LogicalGrouping.MatchAll;
             }
 
             bool trackingAllCaptures;

src/Microsoft.AspNetCore.Rewrite/Internal/IISUrlRewrite/UrlRewriteRuleBuilder.cs

@@ -5,11 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlActions;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlMatches;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
+namespace Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite
 {
     public class UrlRewriteRuleBuilder
     {
@@ -23,14 +22,14 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
         private UrlAction _action;
         private bool _matchAny;
 
-        public UrlRewriteRule Build()
+        public IISUrlRewriteRule Build()
         {
             if (_initialMatch == null || _action == null)
             {
                 throw new InvalidOperationException("Cannot create UrlRewriteRule without action and match");
             }
 
-            return new UrlRewriteRule(Name, _initialMatch, _conditions, _action);
+            return new IISUrlRewriteRule(Name, _initialMatch, _conditions, _action);
         }
 
         public void AddUrlAction(
@@ -107,11 +106,11 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite
                                     }
 
                                     var regex = new Regex(
-                                        pattern, 
+                                        pattern,
                                         ignoreCase ? RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.IgnoreCase :
                                             RegexOptions.CultureInvariant | RegexOptions.Compiled,
                                         RegexTimeout);
-         
+
                                     _conditions.Add(new Condition { Input = input, Match = new RegexMatch(regex, negate), OrNext = _matchAny });
                                     break;
                                 }

src/Microsoft.AspNetCore.Rewrite/Internal/RedirectRule.cs

@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.CodeRules
+namespace Microsoft.AspNetCore.Rewrite.Internal
 {
     public class RedirectRule : Rule
     {
@@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.CodeRules
                     var query = context.HttpContext.Request.QueryString.Add(
                         QueryString.FromUriComponent(
                             newPath.Substring(split)));
-                    // not using the HttpContext.Response.redirect here because status codes may be 301, 302, 307, 308 
+                    // not using the HttpContext.Response.redirect here because status codes may be 301, 302, 307, 308
                     response.Headers[HeaderNames.Location] = pathBase + newPath.Substring(0, split) + query;
                 }
                 else

src/Microsoft.AspNetCore.Rewrite/Internal/RedirectToHttpsRule.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.CodeRules
+namespace Microsoft.AspNetCore.Rewrite.Internal
 {
     public class RedirectToHttpsRule : Rule
     {

src/Microsoft.AspNetCore.Rewrite/Internal/RewriteRule.cs

@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 
-namespace Microsoft.AspNetCore.Rewrite.Internal.CodeRules
+namespace Microsoft.AspNetCore.Rewrite.Internal
 {
     public class RewriteRule : Rule
     {

src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ChangeCookieAction.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Rewrite.Internal.UrlActions
 {

src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/ChangeEnvironmentAction.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Rewrite.Internal.UrlActions
 {

src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RedirectAction.cs

@@ -2,9 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Rewrite.Internal.UrlActions

src/Microsoft.AspNetCore.Rewrite/Internal/UrlActions/RewriteAction.cs

@@ -33,14 +33,14 @@ namespace Microsoft.AspNetCore.Rewrite.Internal.UrlActions
         public RewriteAction(
             RuleTermination result,
             Pattern pattern,
-            bool queryStringAppend):
+            bool queryStringAppend) :
-            this (result, 
+            this(result,
                 pattern,
                 queryStringAppend,
                 queryStringDelete: false,
                 escapeBackReferences: false)
         {
-            
+
         }
 
         public override void ApplyAction(RewriteContext context, MatchResults ruleMatch, MatchResults condMatch)

src/Microsoft.AspNetCore.Rewrite/RewriteMiddleware.cs

@@ -32,9 +32,9 @@ namespace Microsoft.AspNetCore.Rewrite
         /// <param name="loggerFactory">The Logger Factory.</param>
         /// <param name="options">The middleware options, containing the rules to apply.</param>
         public RewriteMiddleware(
-            RequestDelegate next, 
+            RequestDelegate next,
-            IHostingEnvironment hostingEnvironment, 
+            IHostingEnvironment hostingEnvironment,
-            ILoggerFactory loggerFactory, 
+            ILoggerFactory loggerFactory,
             RewriteOptions options)
         {
             if (next == null)
@@ -64,7 +64,9 @@ namespace Microsoft.AspNetCore.Rewrite
             {
                 throw new ArgumentNullException(nameof(context));
             }
-            var rewriteContext = new RewriteContext {
+
+            var rewriteContext = new RewriteContext
+            {
                 HttpContext = context,
                 StaticFileProvider = _fileProvider,
                 Logger = _logger,

src/Microsoft.AspNetCore.Rewrite/RewriteOptionsExtensions.cs

@@ -3,13 +3,11 @@
 
 using System;
 using Microsoft.AspNetCore.Rewrite.Internal;
-using Microsoft.AspNetCore.Rewrite.Internal.CodeRules;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
 
 namespace Microsoft.AspNetCore.Rewrite
 {
     /// <summary>
-    /// The builder to a list of rules for <see cref="RewriteOptions"/> and <see cref="RewriteMiddleware"/> 
+    /// The builder to a list of rules for <see cref="RewriteOptions"/> and <see cref="RewriteMiddleware"/>
     /// </summary>
     public static class RewriteOptionsExtensions
     {
@@ -90,7 +88,7 @@ namespace Microsoft.AspNetCore.Rewrite
         }
 
         /// <summary>
-        /// Redirect a request to https if the incoming request is http, with returning a 301 
+        /// Redirect a request to https if the incoming request is http, with returning a 301
         /// status code for permanently redirected.
         /// </summary>
         /// <param name="options"></param>

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/ConditionPatternParserTest.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.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FlagParserTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/FormatExceptionTests.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RewriteTokenizerTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/RuleRegexParserTest.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.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.ModRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/ApacheModRewrite/TestStringParserTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Rewrite.Internal;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Microsoft.AspNetCore.Rewrite.Internal.PatternSegments;
 using Xunit;
 

test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FileParserTests.cs

@@ -5,10 +5,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Rewrite.Internal;
-using Microsoft.AspNetCore.Rewrite.Internal.ModRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.ApacheModRewrite;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlActions;
 using Microsoft.AspNetCore.Rewrite.Internal.UrlMatches;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                             </rules>
                         </rewrite>";
 
-            var expected = new List<UrlRewriteRule>();
+            var expected = new List<IISUrlRewriteRule>();
             expected.Add(CreateTestRule(new List<Condition>(),
                 url: "^article/([0-9]+)/([_0-9a-z-]+)",
                 name: "Rewrite to article.aspx",
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                 Match = new RegexMatch(new Regex("^OFF$"), false)
             });
 
-            var expected = new List<UrlRewriteRule>();
+            var expected = new List<IISUrlRewriteRule>();
             expected.Add(CreateTestRule(condList,
                 url: "^article/([0-9]+)/([_0-9a-z-]+)",
                 name: "Rewrite to article.aspx",
@@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                 Match = new RegexMatch(new Regex("^OFF$"), false)
             });
 
-            var expected = new List<UrlRewriteRule>();
+            var expected = new List<IISUrlRewriteRule>();
             expected.Add(CreateTestRule(condList,
                 url: "^article/([0-9]+)/([_0-9a-z-]+)",
                 name: "Rewrite to article.aspx",
@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
         }
 
         // Creates a rule with appropriate default values of the url rewrite rule.
-        private UrlRewriteRule CreateTestRule(List<Condition> conditions,
+        private IISUrlRewriteRule CreateTestRule(List<Condition> conditions,
             LogicalGrouping condGrouping = LogicalGrouping.MatchAll,
             bool condTracking = false,
             string name = "",
@@ -146,12 +146,12 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
             RedirectType redirectType = RedirectType.Permanent
             )
         {
-            return new UrlRewriteRule(name, new RegexMatch(new Regex("^OFF$"), false), conditions,
+            return new IISUrlRewriteRule(name, new RegexMatch(new Regex("^OFF$"), false), conditions,
                 new RewriteAction(RuleTermination.Continue, new InputParser().ParseInputString(url), queryStringAppend: false));
         }
 
         // TODO make rules comparable?
-        private void AssertUrlRewriteRuleEquality(IList<UrlRewriteRule> actual, IList<UrlRewriteRule> expected)
+        private void AssertUrlRewriteRuleEquality(IList<IISUrlRewriteRule> actual, IList<IISUrlRewriteRule> expected)
         {
             Assert.Equal(actual.Count, expected.Count);
             for (var i = 0; i < actual.Count; i++)

test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/FormatExceptionHandlingTests.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/InputParserTests.cs

@@ -5,7 +5,7 @@ using System;
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite.Internal;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite

test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/ServerVariableTests.cs

@@ -4,7 +4,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Rewrite.Internal;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 

test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Rewrite.Internal.UrlRewrite;
+using Microsoft.AspNetCore.Rewrite.Internal.IISUrlRewrite;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite