diff --git a/examples/WireMock.Net.ConsoleApplication/Program.cs b/examples/WireMock.Net.ConsoleApplication/Program.cs
index ae4297de..0e1be239 100644
--- a/examples/WireMock.Net.ConsoleApplication/Program.cs
+++ b/examples/WireMock.Net.ConsoleApplication/Program.cs
@@ -19,12 +19,12 @@ namespace WireMock.Net.ConsoleApplication
 
             server
               .Given(
-                RequestBuilder
+                Request
                     .WithUrl("/*")
                     .UsingGet()
               )
               .RespondWith(
-                ResponseBuilder
+                Response
                   .WithStatusCode(200)
                   .WithHeader("Content-Type", "application/json")
                   .WithBody(@"{ ""msg"": ""Hello world!""}")
diff --git a/src/WireMock/CompositeRequestSpec.cs b/src/WireMock/CompositeRequestSpec.cs
index 18e278f2..d11b1614 100644
--- a/src/WireMock/CompositeRequestSpec.cs
+++ b/src/WireMock/CompositeRequestSpec.cs
@@ -43,15 +43,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy(Request request)
+        public bool IsSatisfiedBy(RequestMessage requestMessage)
         {
-            return _requestSpecs.All(spec => spec.IsSatisfiedBy(request));
+            return _requestSpecs.All(spec => spec.IsSatisfiedBy(requestMessage));
         }
     }
 }
diff --git a/src/WireMock/FluentMockServer.cs b/src/WireMock/FluentMockServer.cs
index 8c30bbe4..35ec5063 100644
--- a/src/WireMock/FluentMockServer.cs
+++ b/src/WireMock/FluentMockServer.cs
@@ -43,7 +43,7 @@ namespace WireMock
         /// <summary>
         /// The _request logs.
         /// </summary>
-        private readonly IList<Request> _requestLogs = new List<Request>();
+        private readonly IList<RequestMessage> _requestLogs = new List<RequestMessage>();
 
         /// <summary>
         /// The _request mapper.
@@ -104,13 +104,13 @@ namespace WireMock
         /// <summary>
         /// Gets the request logs.
         /// </summary>
-        public IEnumerable<Request> RequestLogs
+        public IEnumerable<RequestMessage> RequestLogs
         {
             get
             {
                 lock (((ICollection)_requestLogs).SyncRoot)
                 {
-                    return new ReadOnlyCollection<Request>(_requestLogs);
+                    return new ReadOnlyCollection<RequestMessage>(_requestLogs);
                 }
             }
         }
@@ -162,7 +162,7 @@ namespace WireMock
         /// <returns>
         /// The <see cref="IEnumerable"/>.
         /// </returns>
-        public IEnumerable<Request> SearchLogsFor(ISpecifyRequests spec)
+        public IEnumerable<RequestMessage> SearchLogsFor(ISpecifyRequests spec)
         {
             lock (((ICollection)_requestLogs).SyncRoot)
             {
@@ -223,14 +223,14 @@ namespace WireMock
         /// <summary>
         /// The log request.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
-        private void LogRequest(Request request)
+        private void LogRequest(RequestMessage requestMessage)
         {
             lock (((ICollection)_requestLogs).SyncRoot)
             {
-                _requestLogs.Add(request);
+                _requestLogs.Add(requestMessage);
             }
         }
 
diff --git a/src/WireMock/HttpListenerRequestMapper.cs b/src/WireMock/HttpListenerRequestMapper.cs
index 051e47db..b5dc0267 100644
--- a/src/WireMock/HttpListenerRequestMapper.cs
+++ b/src/WireMock/HttpListenerRequestMapper.cs
@@ -27,9 +27,9 @@ namespace WireMock
         /// The listener request.
         /// </param>
         /// <returns>
-        /// The <see cref="RequestBuilder"/>.
+        /// The <see cref="Request"/>.
         /// </returns>
-        public Request Map(HttpListenerRequest listenerRequest)
+        public RequestMessage Map(HttpListenerRequest listenerRequest)
         {
             var path = listenerRequest.Url.AbsolutePath;
             var query = listenerRequest.Url.Query;
@@ -38,7 +38,7 @@ namespace WireMock
             var listenerHeaders = listenerRequest.Headers;
             var headers = listenerHeaders.AllKeys.ToDictionary(k => k, k => listenerHeaders[k]);
 
-            return new Request(path, query, verb, body, headers);
+            return new RequestMessage(path, query, verb, body, headers);
         }
 
         /// <summary>
diff --git a/src/WireMock/HttpListenerResponseMapper.cs b/src/WireMock/HttpListenerResponseMapper.cs
index ad4ccfd1..cb96c132 100644
--- a/src/WireMock/HttpListenerResponseMapper.cs
+++ b/src/WireMock/HttpListenerResponseMapper.cs
@@ -18,19 +18,19 @@ namespace WireMock
         /// <summary>
         /// The map.
         /// </summary>
-        /// <param name="response">
+        /// <param name="responseMessage">
         /// The response.
         /// </param>
         /// <param name="result">
         /// The result.
         /// </param>
-        public void Map(Response response, HttpListenerResponse result)
+        public void Map(ResponseMessage responseMessage, HttpListenerResponse result)
         {
-            result.StatusCode = response.StatusCode;
-            response.Headers.ToList().ForEach(pair => result.AddHeader(pair.Key, pair.Value));
-            if (response.Body != null)
+            result.StatusCode = responseMessage.StatusCode;
+            responseMessage.Headers.ToList().ForEach(pair => result.AddHeader(pair.Key, pair.Value));
+            if (responseMessage.Body != null)
             {
-                var content = Encoding.UTF8.GetBytes(response.Body);
+                var content = Encoding.UTF8.GetBytes(responseMessage.Body);
                 result.OutputStream.Write(content, 0, content.Length);
             }
         }
diff --git a/src/WireMock/IProvideResponses.cs b/src/WireMock/IProvideResponses.cs
index f5565c8c..055d5ec3 100644
--- a/src/WireMock/IProvideResponses.cs
+++ b/src/WireMock/IProvideResponses.cs
@@ -16,12 +16,12 @@ namespace WireMock
         /// <summary>
         /// The provide response.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="Task"/>.
         /// </returns>
-        Task<Response> ProvideResponse(Request request);
+        Task<ResponseMessage> ProvideResponse(RequestMessage requestMessage);
     }
 }
diff --git a/src/WireMock/ISpecifyRequests.cs b/src/WireMock/ISpecifyRequests.cs
index cdee79ea..c62c92f8 100644
--- a/src/WireMock/ISpecifyRequests.cs
+++ b/src/WireMock/ISpecifyRequests.cs
@@ -16,12 +16,12 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        bool IsSatisfiedBy([NotNull] Request request);
+        bool IsSatisfiedBy([NotNull] RequestMessage requestMessage);
     }
 }
diff --git a/src/WireMock/RequestBodySpec.cs b/src/WireMock/RequestBodySpec.cs
index 0c8f391c..5dc7b60f 100644
--- a/src/WireMock/RequestBodySpec.cs
+++ b/src/WireMock/RequestBodySpec.cs
@@ -44,15 +44,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy(Request request)
+        public bool IsSatisfiedBy(RequestMessage requestMessage)
         {
-            return bodyRegex.IsMatch(request.Body);
+            return bodyRegex.IsMatch(requestMessage.Body);
         }
     }
 }
diff --git a/src/WireMock/RequestBuilders/RequestBuilder.cs b/src/WireMock/RequestBuilders/Request.cs
similarity index 94%
rename from src/WireMock/RequestBuilders/RequestBuilder.cs
rename to src/WireMock/RequestBuilders/Request.cs
index 2abc75a2..b252cd6a 100644
--- a/src/WireMock/RequestBuilders/RequestBuilder.cs
+++ b/src/WireMock/RequestBuilders/Request.cs
@@ -25,7 +25,7 @@ namespace WireMock.RequestBuilders
     /// <summary>
     /// The requests.
     /// </summary>
-    public class RequestBuilder : CompositeRequestSpec, IVerbRequestBuilder, IHeadersRequestBuilder, IParamsRequestBuilder
+    public class Request : CompositeRequestSpec, IVerbRequestBuilder, IHeadersRequestBuilder, IParamsRequestBuilder
     {
         /// <summary>
         /// The _request specs.
@@ -33,12 +33,12 @@ namespace WireMock.RequestBuilders
         private readonly IList<ISpecifyRequests> _requestSpecs;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="RequestBuilder"/> class.
+        /// Initializes a new instance of the <see cref="Request"/> class.
         /// </summary>
         /// <param name="requestSpecs">
         /// The request specs.
         /// </param>
-        private RequestBuilder(IList<ISpecifyRequests> requestSpecs) : base(requestSpecs)
+        private Request(IList<ISpecifyRequests> requestSpecs) : base(requestSpecs)
         {
             _requestSpecs = requestSpecs;
         }
@@ -55,7 +55,7 @@ namespace WireMock.RequestBuilders
         public static IVerbRequestBuilder WithUrl(string url)
         {
             var specs = new List<ISpecifyRequests>();
-            var requests = new RequestBuilder(specs);
+            var requests = new Request(specs);
             specs.Add(new RequestUrlSpec(url));
             return requests;
         }
@@ -72,7 +72,7 @@ namespace WireMock.RequestBuilders
         public static IVerbRequestBuilder WithPath(string path)
         {
             var specs = new List<ISpecifyRequests>();
-            var requests = new RequestBuilder(specs);
+            var requests = new Request(specs);
             specs.Add(new RequestPathSpec(path));
             return requests;
         }
diff --git a/src/WireMock/RequestHeaderSpec.cs b/src/WireMock/RequestHeaderSpec.cs
index a3a30a68..43e70172 100644
--- a/src/WireMock/RequestHeaderSpec.cs
+++ b/src/WireMock/RequestHeaderSpec.cs
@@ -52,15 +52,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy([NotNull] Request request)
+        public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
         {
-            string headerValue = request.Headers[name];
+            string headerValue = requestMessage.Headers[name];
             return patternRegex.IsMatch(headerValue);
         }
     }
diff --git a/src/WireMock/Request.cs b/src/WireMock/RequestMessage.cs
similarity index 92%
rename from src/WireMock/Request.cs
rename to src/WireMock/RequestMessage.cs
index cb5cc4b6..2ac15c19 100644
--- a/src/WireMock/Request.cs
+++ b/src/WireMock/RequestMessage.cs
@@ -25,7 +25,7 @@ namespace WireMock
     /// <summary>
     /// The request.
     /// </summary>
-    public class Request
+    public class RequestMessage
     {
         /// <summary>
         /// The _params.
@@ -33,7 +33,7 @@ namespace WireMock
         private readonly Dictionary<string, List<string>> _params = new Dictionary<string, List<string>>();
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Request"/> class.
+        /// Initializes a new instance of the <see cref="RequestMessage"/> class.
         /// </summary>
         /// <param name="path">
         /// The path.
@@ -50,7 +50,7 @@ namespace WireMock
         /// <param name="headers">
         /// The headers.
         /// </param>
-        public Request(string path, string query, string verb, string body, IDictionary<string, string> headers)
+        public RequestMessage(string path, string query, string verb, string body, IDictionary<string, string> headers)
         {
             if (!string.IsNullOrEmpty(query))
             {
@@ -127,12 +127,7 @@ namespace WireMock
         /// </returns>
         public List<string> GetParameter(string key)
         {
-            if (_params.ContainsKey(key))
-            {
-                return _params[key];
-            }
-
-            return new List<string>();
+            return _params.ContainsKey(key) ? _params[key] : new List<string>();
         }
     }
 }
diff --git a/src/WireMock/RequestParamSpec.cs b/src/WireMock/RequestParamSpec.cs
index b7949d9e..065f6658 100644
--- a/src/WireMock/RequestParamSpec.cs
+++ b/src/WireMock/RequestParamSpec.cs
@@ -52,15 +52,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy([NotNull] Request request)
+        public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
         {
-            return request.GetParameter(_key).Intersect(_values).Count() == _values.Count;
+            return requestMessage.GetParameter(_key).Intersect(_values).Count() == _values.Count;
         }
     }
 }
diff --git a/src/WireMock/RequestPathSpec.cs b/src/WireMock/RequestPathSpec.cs
index 19744018..c1e56f60 100644
--- a/src/WireMock/RequestPathSpec.cs
+++ b/src/WireMock/RequestPathSpec.cs
@@ -44,15 +44,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy([NotNull] Request request)
+        public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
         {
-            return _path.IsMatch(request.Path);
+            return _path.IsMatch(requestMessage.Path);
         }
     }
 }
diff --git a/src/WireMock/RequestUrlSpec.cs b/src/WireMock/RequestUrlSpec.cs
index 32af08a9..e0abe499 100644
--- a/src/WireMock/RequestUrlSpec.cs
+++ b/src/WireMock/RequestUrlSpec.cs
@@ -44,15 +44,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy(Request request)
+        public bool IsSatisfiedBy(RequestMessage requestMessage)
         {
-            return urlRegex.IsMatch(request.Url);
+            return urlRegex.IsMatch(requestMessage.Url);
         }
     }
 }
diff --git a/src/WireMock/RequestVerbSpec.cs b/src/WireMock/RequestVerbSpec.cs
index 9f153534..15dd43e5 100644
--- a/src/WireMock/RequestVerbSpec.cs
+++ b/src/WireMock/RequestVerbSpec.cs
@@ -41,15 +41,15 @@ namespace WireMock
         /// <summary>
         /// The is satisfied by.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsSatisfiedBy([NotNull] Request request)
+        public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
         {
-            return request.Verb == _verb;
+            return requestMessage.Verb == _verb;
         }
     }
 }
diff --git a/src/WireMock/ResponseBuilders/ResponseBuilder.cs b/src/WireMock/ResponseBuilders/Response.cs
similarity index 84%
rename from src/WireMock/ResponseBuilders/ResponseBuilder.cs
rename to src/WireMock/ResponseBuilders/Response.cs
index 0070176f..2b0af198 100644
--- a/src/WireMock/ResponseBuilders/ResponseBuilder.cs
+++ b/src/WireMock/ResponseBuilders/Response.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 
@@ -21,12 +21,12 @@ namespace WireMock.ResponseBuilders
     /// <summary>
     /// The responses.
     /// </summary>
-    public class ResponseBuilder : IHeadersResponseBuilder
+    public class Response : IHeadersResponseBuilder
     {
         /// <summary>
         /// The _response.
         /// </summary>
-        private readonly Response _response;
+        private readonly ResponseMessage _responseMessage;
 
         /// <summary>
         /// The _delay.
@@ -34,14 +34,14 @@ namespace WireMock.ResponseBuilders
         private TimeSpan _delay = TimeSpan.Zero;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ResponseBuilder"/> class.
+        /// Initializes a new instance of the <see cref="Response"/> class.
         /// </summary>
-        /// <param name="response">
+        /// <param name="responseMessage">
         /// The response.
         /// </param>
-        public ResponseBuilder(Response response)
+        public Response(ResponseMessage responseMessage)
         {
-            _response = response;
+            _responseMessage = responseMessage;
         }
 
         /// <summary>
@@ -73,23 +73,23 @@ namespace WireMock.ResponseBuilders
         /// </returns>
         public static IHeadersResponseBuilder WithStatusCode(int code)
         {
-            var response = new Response { StatusCode = code };
-            return new ResponseBuilder(response);
+            var response = new ResponseMessage { StatusCode = code };
+            return new Response(response);
         }
 
         /// <summary>
         /// The provide response.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="Task"/>.
         /// </returns>
-        public async Task<Response> ProvideResponse(Request request)
+        public async Task<ResponseMessage> ProvideResponse(RequestMessage requestMessage)
         {
             await Task.Delay(_delay);
-            return _response;
+            return _responseMessage;
         }
 
         /// <summary>
@@ -106,7 +106,7 @@ namespace WireMock.ResponseBuilders
         /// </returns>
         public IHeadersResponseBuilder WithHeader(string name, string value)
         {
-            _response.AddHeader(name, value);
+            _responseMessage.AddHeader(name, value);
             return this;
         }
 
@@ -121,7 +121,7 @@ namespace WireMock.ResponseBuilders
         /// </returns>
         public IDelayResponseBuilder WithBody(string body)
         {
-            _response.Body = body;
+            _responseMessage.Body = body;
             return this;
         }
 
diff --git a/src/WireMock/Response.cs b/src/WireMock/ResponseMessage.cs
similarity index 98%
rename from src/WireMock/Response.cs
rename to src/WireMock/ResponseMessage.cs
index ef134c3a..24963cbe 100644
--- a/src/WireMock/Response.cs
+++ b/src/WireMock/ResponseMessage.cs
@@ -21,7 +21,7 @@ namespace WireMock
     /// <summary>
     /// The response.
     /// </summary>
-    public class Response
+    public class ResponseMessage
     {
         /// <summary>
         /// The _headers.
diff --git a/src/WireMock/Route.cs b/src/WireMock/Route.cs
index 4f1d3f9f..40b57ffe 100644
--- a/src/WireMock/Route.cs
+++ b/src/WireMock/Route.cs
@@ -50,29 +50,29 @@ namespace WireMock
         /// <summary>
         /// The response to.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="Task"/>.
         /// </returns>
-        public Task<Response> ResponseTo(Request request)
+        public Task<ResponseMessage> ResponseTo(RequestMessage requestMessage)
         {
-            return _provider.ProvideResponse(request);
+            return _provider.ProvideResponse(requestMessage);
         }
 
         /// <summary>
         /// The is request handled.
         /// </summary>
-        /// <param name="request">
+        /// <param name="requestMessage">
         /// The request.
         /// </param>
         /// <returns>
         /// The <see cref="bool"/>.
         /// </returns>
-        public bool IsRequestHandled(Request request)
+        public bool IsRequestHandled(RequestMessage requestMessage)
         {
-            return _requestSpec.IsSatisfiedBy(request);
+            return _requestSpec.IsSatisfiedBy(requestMessage);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/FluentMockServerTests.cs b/test/WireMock.Net.Tests/FluentMockServerTests.cs
index c8c2726f..2c15b19a 100644
--- a/test/WireMock.Net.Tests/FluentMockServerTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.cs
@@ -43,10 +43,10 @@ namespace WireMock.Net.Tests
             _server = FluentMockServer.Start();
 
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/foo")
                     .UsingGet())
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(200)
                     .WithBody(@"{ msg: ""Hello world!""}"));
 
@@ -100,7 +100,7 @@ namespace WireMock.Net.Tests
             await new HttpClient().GetAsync("http://localhost:" + _server.Port + "/bar");
 
             // then
-            var result = _server.SearchLogsFor(RequestBuilder.WithUrl("/b.*"));
+            var result = _server.SearchLogsFor(Request.WithUrl("/b.*"));
             Check.That(result).HasSize(1);
             var requestLogged = result.First();
             Check.That(requestLogged.Url).IsEqualTo("/bar");
@@ -127,10 +127,10 @@ namespace WireMock.Net.Tests
             _server = FluentMockServer.Start();
 
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/foo")
                     .UsingGet())
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(200)
                     .WithBody(@"{ msg: ""Hello world!""}"));
 
@@ -149,17 +149,17 @@ namespace WireMock.Net.Tests
             _server = FluentMockServer.Start();
 
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/foo")
                     .UsingGet())
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(307)
                     .WithHeader("Location", "/bar"));
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/bar")
                     .UsingGet())
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(200)
                     .WithBody("REDIRECT SUCCESSFUL"));
 
@@ -178,9 +178,9 @@ namespace WireMock.Net.Tests
             _server = FluentMockServer.Start();
 
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/*"))
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(200)
                     .WithBody(@"{ msg: ""Hello world!""}")
                     .AfterDelay(TimeSpan.FromMilliseconds(2000)));
@@ -202,9 +202,9 @@ namespace WireMock.Net.Tests
             _server = FluentMockServer.Start();
             _server.AddRequestProcessingDelay(TimeSpan.FromMilliseconds(2000));
             _server
-                .Given(RequestBuilder
+                .Given(Request
                     .WithUrl("/*"))
-                .RespondWith(ResponseBuilder
+                .RespondWith(Response
                     .WithStatusCode(200)
                     .WithBody(@"{ msg: ""Hello world!""}"));
 
diff --git a/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs b/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs
index 33815db2..752d0602 100644
--- a/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs
+++ b/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs
@@ -49,8 +49,8 @@ namespace WireMock.Net.Tests
             await client.GetAsync(MapperServer.UrlPrefix + "toto");
 
             // then
-            Check.That(MapperServer.LastRequest).IsNotNull();
-            Check.That(MapperServer.LastRequest.Url).IsEqualTo("/toto");
+            Check.That(MapperServer.LastRequestMessage).IsNotNull();
+            Check.That(MapperServer.LastRequestMessage.Url).IsEqualTo("/toto");
         }
 
         [Test]
@@ -63,8 +63,8 @@ namespace WireMock.Net.Tests
             await client.PutAsync(MapperServer.UrlPrefix, new StringContent("Hello!"));
 
             // then
-            Check.That(MapperServer.LastRequest).IsNotNull();
-            Check.That(MapperServer.LastRequest.Verb).IsEqualTo("put");
+            Check.That(MapperServer.LastRequestMessage).IsNotNull();
+            Check.That(MapperServer.LastRequestMessage.Verb).IsEqualTo("put");
         }
 
         [Test]
@@ -77,8 +77,8 @@ namespace WireMock.Net.Tests
             await client.PutAsync(MapperServer.UrlPrefix, new StringContent("Hello!"));
 
             // then
-            Check.That(MapperServer.LastRequest).IsNotNull();
-            Check.That(MapperServer.LastRequest.Body).IsEqualTo("Hello!");
+            Check.That(MapperServer.LastRequestMessage).IsNotNull();
+            Check.That(MapperServer.LastRequestMessage.Body).IsEqualTo("Hello!");
         }
 
         [Test]
@@ -92,9 +92,9 @@ namespace WireMock.Net.Tests
             await client.GetAsync(MapperServer.UrlPrefix);
 
             // then
-            Check.That(MapperServer.LastRequest).IsNotNull();
-            Check.That(MapperServer.LastRequest.Headers).Not.IsNullOrEmpty();
-            Check.That(MapperServer.LastRequest.Headers.Contains(new KeyValuePair<string, string>("X-Alex", "1706"))).IsTrue();
+            Check.That(MapperServer.LastRequestMessage).IsNotNull();
+            Check.That(MapperServer.LastRequestMessage.Headers).Not.IsNullOrEmpty();
+            Check.That(MapperServer.LastRequestMessage.Headers.Contains(new KeyValuePair<string, string>("X-Alex", "1706"))).IsTrue();
         }
 
         [Test]
@@ -107,9 +107,9 @@ namespace WireMock.Net.Tests
             await client.GetAsync(MapperServer.UrlPrefix + "index.html?id=toto");
 
             // then
-            Check.That(MapperServer.LastRequest).IsNotNull();
-            Check.That(MapperServer.LastRequest.Path).EndsWith("/index.html");
-            Check.That(MapperServer.LastRequest.GetParameter("id")).HasSize(1);
+            Check.That(MapperServer.LastRequestMessage).IsNotNull();
+            Check.That(MapperServer.LastRequestMessage.Path).EndsWith("/index.html");
+            Check.That(MapperServer.LastRequestMessage.GetParameter("id")).HasSize(1);
         }
 
         [TearDown]
@@ -120,22 +120,22 @@ namespace WireMock.Net.Tests
 
         private class MapperServer : TinyHttpServer
         {
-            private static volatile Request _lastRequest;
+            private static volatile RequestMessage _lastRequestMessage;
 
             private MapperServer(string urlPrefix, Action<HttpListenerContext> httpHandler) : base(urlPrefix, httpHandler)
             {
             }
 
-            public static Request LastRequest
+            public static RequestMessage LastRequestMessage
             {
                 get
                 {
-                    return _lastRequest;
+                    return _lastRequestMessage;
                 }
 
                 private set
                 {
-                    _lastRequest = value;
+                    _lastRequestMessage = value;
                 }
             }
 
@@ -149,7 +149,7 @@ namespace WireMock.Net.Tests
                     UrlPrefix, 
                     context =>
                         {
-                            LastRequest = new HttpListenerRequestMapper().Map(context.Request);
+                            LastRequestMessage = new HttpListenerRequestMapper().Map(context.Request);
                             context.Response.Close();
                         });
                 ((TinyHttpServer)server).Start();
@@ -159,7 +159,7 @@ namespace WireMock.Net.Tests
             public new void Stop()
             {
                 base.Stop();
-                LastRequest = null;
+                LastRequestMessage = null;
             }
         }
     }
diff --git a/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs b/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs
index 72d4358b..19bb011c 100644
--- a/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs
+++ b/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs
@@ -37,7 +37,7 @@ namespace WireMock.Net.Tests
         public void Should_map_status_code_from_original_response()
         {
             // given
-            var response = new Response { StatusCode = 404 };
+            var response = new ResponseMessage { StatusCode = 404 };
             var httpListenerResponse = CreateHttpListenerResponse();
 
             // when
@@ -51,7 +51,7 @@ namespace WireMock.Net.Tests
         public void Should_map_headers_from_original_response()
         {
             // given
-            var response = new Response();
+            var response = new ResponseMessage();
             response.AddHeader("cache-control", "no-cache");
             var httpListenerResponse = CreateHttpListenerResponse();
 
@@ -68,7 +68,7 @@ namespace WireMock.Net.Tests
         public void Should_map_body_from_original_response()
         {
             // given
-            var response = new Response();
+            var response = new ResponseMessage();
             response.Body = "Hello !!!";
             var httpListenerResponse = CreateHttpListenerResponse();
 
diff --git a/test/WireMock.Net.Tests/RequestTests.cs b/test/WireMock.Net.Tests/RequestTests.cs
index 5777f1c1..2575d606 100644
--- a/test/WireMock.Net.Tests/RequestTests.cs
+++ b/test/WireMock.Net.Tests/RequestTests.cs
@@ -21,7 +21,7 @@ namespace WireMock.Net.Tests
         public void Should_handle_empty_query()
         {
             // given
-            var request = new Request("/foo", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(request.GetParameter("foo")).IsEmpty();
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests
         public void Should_parse_query_params()
         {
             // given
-            var request = new Request("/foo", "foo=bar&multi=1&multi=2", "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", "foo=bar&multi=1&multi=2", "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(request.GetParameter("foo")).Contains("bar");
diff --git a/test/WireMock.Net.Tests/RequestsTests.cs b/test/WireMock.Net.Tests/RequestsTests.cs
index 7a945d1a..91629df6 100644
--- a/test/WireMock.Net.Tests/RequestsTests.cs
+++ b/test/WireMock.Net.Tests/RequestsTests.cs
@@ -22,10 +22,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_url()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo");
+            var spec = Request.WithUrl("/foo");
 
             // when
-            var request = new Request("/foo", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -35,10 +35,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_url_prefix()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo*");
+            var spec = Request.WithUrl("/foo*");
 
             // when
-            var request = new Request("/foo/bar", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo/bar", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -48,10 +48,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_not_matching_given_url()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo");
+            var spec = Request.WithUrl("/foo");
 
             // when
-            var request = new Request("/bar", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/bar", string.Empty, "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -61,10 +61,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_path()
         {
             // given
-            var spec = RequestBuilder.WithPath("/foo");
+            var spec = Request.WithPath("/foo");
 
             // when
-            var request = new Request("/foo", "?param=1", "blabla", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", "?param=1", "blabla", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -74,10 +74,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_url_and_method()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingPut();
+            var spec = Request.WithUrl("/foo").UsingPut();
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -87,10 +87,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_matching_given_url_but_not_http_method()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingPut();
+            var spec = Request.WithUrl("/foo").UsingPut();
 
             // when
-            var request = new Request("/foo", string.Empty, "POST", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "POST", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -100,10 +100,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_matching_given_http_method_but_not_url()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/bar").UsingPut();
+            var spec = Request.WithUrl("/bar").UsingPut();
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -113,10 +113,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_url_and_headers()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tata");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tata");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "tata" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -126,10 +126,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_not_matching_given_headers()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tatata");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tatata");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "tata" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -139,10 +139,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_not_matching_given_headers_ignorecase()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "abc", false);
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "abc", false);
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "ABC" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "ABC" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -152,10 +152,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_header_prefix()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tata*");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithHeader("X-toto", "tata*");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "TaTaTa" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "whatever", new Dictionary<string, string> { { "X-toto", "TaTaTa" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -165,10 +165,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_body()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithBody(".*Hello world!.*");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithBody(".*Hello world!.*");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "Hello world!", new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "Hello world!", new Dictionary<string, string> { { "X-toto", "tatata" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -178,10 +178,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_body_as_wildcard()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithBody("H.*o");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithBody("H.*o");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "Hello world!", new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "Hello world!", new Dictionary<string, string> { { "X-toto", "tatata" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -191,10 +191,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_not_matching_given_body()
         {
             // given
-            var spec = RequestBuilder.WithUrl("/foo").UsingAnyVerb().WithBody("      Hello world!   ");
+            var spec = Request.WithUrl("/foo").UsingAnyVerb().WithBody("      Hello world!   ");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "XXXXXXXXXXX", new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "XXXXXXXXXXX", new Dictionary<string, string> { { "X-toto", "tatata" } });
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();
@@ -204,10 +204,10 @@ namespace WireMock.Net.Tests
         public void Should_specify_requests_matching_given_params()
         {
             // given
-            var spec = RequestBuilder.WithPath("/foo").WithParam("bar", "1", "2");
+            var spec = Request.WithPath("/foo").WithParam("bar", "1", "2");
 
             // when
-            var request = new Request("/foo", "bar=1&bar=2", "Get", "Hello world!", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", "bar=1&bar=2", "Get", "Hello world!", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsTrue();
@@ -217,10 +217,10 @@ namespace WireMock.Net.Tests
         public void Should_exclude_requests_not_matching_given_params()
         {
             // given
-            var spec = RequestBuilder.WithPath("/foo").WithParam("bar", "1");
+            var spec = Request.WithPath("/foo").WithParam("bar", "1");
 
             // when
-            var request = new Request("/foo", string.Empty, "PUT", "XXXXXXXXXXX", new Dictionary<string, string>());
+            var request = new RequestMessage("/foo", string.Empty, "PUT", "XXXXXXXXXXX", new Dictionary<string, string>());
 
             // then
             Check.That(spec.IsSatisfiedBy(request)).IsFalse();