diff --git a/restlike/receiver.go b/restlike/singleReceiver.go
similarity index 100%
rename from restlike/receiver.go
rename to restlike/singleReceiver.go
diff --git a/restlike/receiver_test.go b/restlike/singleReceiver_test.go
similarity index 100%
rename from restlike/receiver_test.go
rename to restlike/singleReceiver_test.go
diff --git a/restlike/request.go b/restlike/singleRequest.go
similarity index 93%
rename from restlike/request.go
rename to restlike/singleRequest.go
index 5b9e0427089dbeb53a4474dbb0f2afa01112e137..774f112c43745c0a36b9692ceb209bd4e8b783f1 100644
--- a/restlike/request.go
+++ b/restlike/singleRequest.go
@@ -26,7 +26,7 @@ type SingleRequest struct {
 
 // Request provides several Method of sending Data to the given URI
 // and blocks until the Message is returned
-func (s *SingleRequest) Request(method Method, recipient contact.Contact, path URI,
+func (s *SingleRequest) Request(recipient contact.Contact, method Method, path URI,
 	content Data, headers *Headers, singleParams single.RequestParams) (*Message, error) {
 	// Build the Message
 	newMessage := &Message{
@@ -63,7 +63,7 @@ func (s *SingleRequest) Request(method Method, recipient contact.Contact, path U
 
 // AsyncRequest provides several Method of sending Data to the given URI
 // and will return the Message to the given Callback when received
-func (s *SingleRequest) AsyncRequest(method Method, recipient contact.Contact, path URI,
+func (s *SingleRequest) AsyncRequest(recipient contact.Contact, method Method, path URI,
 	content Data, headers *Headers, cb RequestCallback, singleParams single.RequestParams) error {
 	// Build the Message
 	newMessage := &Message{
diff --git a/restlike/response.go b/restlike/singleResponse.go
similarity index 100%
rename from restlike/response.go
rename to restlike/singleResponse.go
diff --git a/restlike/response_test.go b/restlike/singleResponse_test.go
similarity index 100%
rename from restlike/response_test.go
rename to restlike/singleResponse_test.go