diff --git a/Sources/Client/FHIROpenServer.swift b/Sources/Client/FHIROpenServer.swift
index a01b4aab..ead2f7ed 100644
--- a/Sources/Client/FHIROpenServer.swift
+++ b/Sources/Client/FHIROpenServer.swift
@@ -84,7 +84,7 @@ open class FHIROpenServer: FHIRServer {
 	- returns: An appropriate `FHIRServerRequestHandler`, for example a _FHIRServerJSONRequestHandler_ if sending and receiving JSON
 	*/
 	open func handlerForRequest(_ ofType: FHIRRequestType, resource: Resource?, headers: FHIRRequestHeaders? = nil) -> FHIRServerRequestHandler? {
-		let handler = FHIRServerJSONRequestHandler(type: ofType, resource: resource)
+		let handler = FHIRServerJSONRequestHandler(ofType, resource: resource)
 		if let headers = headers {
 			handler.add(headers: headers)
 		}
diff --git a/Sources/Client/FHIRServerRequestHandler.swift b/Sources/Client/FHIRServerRequestHandler.swift
index 9984f911..919bd0c1 100644
--- a/Sources/Client/FHIRServerRequestHandler.swift
+++ b/Sources/Client/FHIRServerRequestHandler.swift
@@ -24,7 +24,7 @@ open class FHIRServerRequestHandler {
 	}
 	
 	/// The HTTP type of the request.
-	open let type: FHIRRequestType
+	open let method: FHIRRequestType
 	
 	/// Headers to be used on the request.
 	open var headers: FHIRRequestHeaders
@@ -35,8 +35,8 @@ open class FHIRServerRequestHandler {
 	/// The receiver may hold on to a resource that supplies the request's body data.
 	open var resource: Resource?
 	
-	public init(type: FHIRRequestType, resource: Resource? = nil) {
-		self.type = type
+	public init(_ method: FHIRRequestType, resource: Resource? = nil) {
+		self.method = method
 		self.headers = type(of: self).defaultHeaders
 		self.resource = resource
 	}
@@ -73,7 +73,7 @@ open class FHIRServerRequestHandler {
 	*/
 	open func prepare(request: inout URLRequest) throws {
 		try prepareData()
-		type.prepare(request: &request, body: data)
+		method.prepare(request: &request, body: data)
 		headers.prepare(request: &request)
 	}
 	
@@ -143,7 +143,7 @@ open class FHIRServerJSONRequestHandler: FHIRServerRequestHandler {
 	}
 	
 	open override func prepare(request: inout URLRequest) throws {
-		switch type {
+		switch method {
 		case .PUT:
 			headers[.contentType] = "application/json+fhir; charset=utf-8"
 		case .POST:
@@ -172,14 +172,14 @@ open class FHIRServerDataRequestHandler: FHIRServerRequestHandler {
 	
 	init(_ type: FHIRRequestType, contentType: String) {
 		self.contentType = contentType
-		super.init(type: type, resource: nil)
+		super.init(type, resource: nil)
 	}
 	
 	override open func prepareData() throws {
 	}
 	
 	open override func prepare(request: inout URLRequest) throws {
-		switch type {
+		switch method {
 		case .GET:
 			headers[.accept] = contentType
 		case .PUT:
diff --git a/Tests/RequestTests.swift b/Tests/RequestTests.swift
index 3e203c37..7b8abb84 100644
--- a/Tests/RequestTests.swift
+++ b/Tests/RequestTests.swift
@@ -16,12 +16,12 @@ Test request generation.
 class RequestTests: XCTestCase {
 	
 	func testJSONGETRequest() {
-		let handler = FHIRServerJSONRequestHandler(type: .GET)
+		let handler = FHIRServerJSONRequestHandler(.GET)
 		XCTAssertEqual("application/json+fhir", handler.headers[.accept])
 	}
 	
 	func testJSONPUTRequest() {
-		let handler = FHIRServerJSONRequestHandler(type: .PUT)
+		let handler = FHIRServerJSONRequestHandler(.PUT)
 		var req = URLRequest(url: URL(string: "https://fhir.smarthealthit.org")!)
 		try! handler.prepare(request: &req)
 		XCTAssertEqual("application/json+fhir", handler.headers[.accept])
@@ -41,7 +41,7 @@ class RequestTests: XCTestCase {
 	}
 	
 	func testJSONPOSTRequest() {
-		let handler = FHIRServerJSONRequestHandler(type: .POST)
+		let handler = FHIRServerJSONRequestHandler(.POST)
 		var req = URLRequest(url: URL(string: "https://fhir.smarthealthit.org")!)
 		try! handler.prepare(request: &req)
 		XCTAssertEqual("application/json+fhir", handler.headers[.accept])
diff --git a/Tests/ResourceTests.swift b/Tests/ResourceTests.swift
index 9022f7ab..12b54369 100644
--- a/Tests/ResourceTests.swift
+++ b/Tests/ResourceTests.swift
@@ -200,7 +200,7 @@ class LocalPatientServer: FHIROpenServer {
 				pat.meta?.versionId = "\(version+1)"
 				pat.name = [HumanName(json: ["family": ["POST"]])]
 				
-				let req = FHIRServerJSONRequestHandler(type: .POST)
+				let req = FHIRServerJSONRequestHandler(.POST)
 				req.resource = pat
 				try! req.prepareData()