diff --git a/auth-client.go b/auth-client.go
index e90157f0..9db381e7 100644
--- a/auth-client.go
+++ b/auth-client.go
@@ -61,7 +61,7 @@ func NewAuthClient(header []string, user string, pass string) (*AuthClient, erro
 }
 
 // GenerateHeader generates an Authorization Header that allows to authenticate a request with
-// the given method and path.
+// the given method and url.
 func (ac *AuthClient) GenerateHeader(method Method, ur *url.URL) []string {
 	ha1 := md5Hex(ac.user + ":" + ac.realm + ":" + ac.pass)
 	ha2 := md5Hex(string(method) + ":" + ur.String())
diff --git a/response.go b/response.go
index 9418cfdc..0a8bb560 100644
--- a/response.go
+++ b/response.go
@@ -61,10 +61,10 @@ const (
 
 // Response is a RTSP response.
 type Response struct {
-	StatusCode StatusCode
-	Status     string
-	Header     Header
-	Content    []byte
+	StatusCode    StatusCode
+	StatusMessage string
+	Header        Header
+	Content       []byte
 }
 
 func readResponse(br *bufio.Reader) (*Response, error) {
@@ -96,9 +96,9 @@ func readResponse(br *bufio.Reader) (*Response, error) {
 	if err != nil {
 		return nil, err
 	}
-	res.Status = string(byts[:len(byts)-1])
+	res.StatusMessage = string(byts[:len(byts)-1])
 
-	if len(res.Status) == 0 {
+	if len(res.StatusMessage) == 0 {
 		return nil, fmt.Errorf("empty status")
 	}
 
@@ -121,13 +121,13 @@ func readResponse(br *bufio.Reader) (*Response, error) {
 }
 
 func (res *Response) write(bw *bufio.Writer) error {
-	if res.Status == "" {
+	if res.StatusMessage == "" {
 		if status, ok := statusMessages[res.StatusCode]; ok {
-			res.Status = status
+			res.StatusMessage = status
 		}
 	}
 
-	_, err := bw.Write([]byte(_RTSP_PROTO + " " + strconv.FormatInt(int64(res.StatusCode), 10) + " " + res.Status + "\r\n"))
+	_, err := bw.Write([]byte(_RTSP_PROTO + " " + strconv.FormatInt(int64(res.StatusCode), 10) + " " + res.StatusMessage + "\r\n"))
 	if err != nil {
 		return err
 	}
diff --git a/response_test.go b/response_test.go
index 6d721f12..5eafe6e7 100644
--- a/response_test.go
+++ b/response_test.go
@@ -21,8 +21,8 @@ var casesResponse = []struct {
 			"\r\n",
 		),
 		&Response{
-			StatusCode: StatusOK,
-			Status:     "OK",
+			StatusCode:    StatusOK,
+			StatusMessage: "OK",
 			Header: Header{
 				"CSeq":   []string{"1"},
 				"Public": []string{"DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE"},
@@ -40,8 +40,8 @@ var casesResponse = []struct {
 			"\r\n",
 		),
 		&Response{
-			StatusCode: StatusOK,
-			Status:     "OK",
+			StatusCode:    StatusOK,
+			StatusMessage: "OK",
 			Header: Header{
 				"CSeq":    []string{"2"},
 				"Session": []string{"645252166"},
@@ -79,8 +79,8 @@ var casesResponse = []struct {
 			"a=StreamName:string;\"hinted audio track\"\n",
 		),
 		&Response{
-			StatusCode: 200,
-			Status:     "OK",
+			StatusCode:    200,
+			StatusMessage: "OK",
 			Header: Header{
 				"Content-Base":   []string{"rtsp://example.com/media.mp4"},
 				"Content-Length": []string{"444"},