diff --git a/base/request.go b/base/request.go
index c212ce6a..0431a411 100644
--- a/base/request.go
+++ b/base/request.go
@@ -40,7 +40,7 @@ type Request struct {
 	Method Method
 
 	// request url
-	Url *url.URL
+	URL *url.URL
 
 	// map of header values
 	Header Header
@@ -79,9 +79,9 @@ func (req *Request) Read(rb *bufio.Reader) error {
 	if err != nil {
 		return fmt.Errorf("unable to parse url (%v)", rawUrl)
 	}
-	req.Url = ur
+	req.URL = ur
 
-	if req.Url.Scheme != "rtsp" {
+	if req.URL.Scheme != "rtsp" {
 		return fmt.Errorf("invalid url scheme (%v)", rawUrl)
 	}
 
@@ -118,11 +118,11 @@ func (req *Request) Read(rb *bufio.Reader) error {
 func (req Request) Write(bw *bufio.Writer) error {
 	// remove credentials
 	u := &url.URL{
-		Scheme:   req.Url.Scheme,
-		Host:     req.Url.Host,
-		Path:     req.Url.Path,
-		RawPath:  req.Url.RawPath,
-		RawQuery: req.Url.RawQuery,
+		Scheme:   req.URL.Scheme,
+		Host:     req.URL.Host,
+		Path:     req.URL.Path,
+		RawPath:  req.URL.RawPath,
+		RawQuery: req.URL.RawQuery,
 	}
 
 	_, err := bw.Write([]byte(string(req.Method) + " " + u.String() + " " + rtspProtocol10 + "\r\n"))
diff --git a/base/request_test.go b/base/request_test.go
index 51ca2a78..c094d3c9 100644
--- a/base/request_test.go
+++ b/base/request_test.go
@@ -31,7 +31,7 @@ var casesRequest = []struct {
 			"\r\n"),
 		Request{
 			Method: "OPTIONS",
-			Url:    urlMustParse("rtsp://example.com/media.mp4"),
+			URL:    urlMustParse("rtsp://example.com/media.mp4"),
 			Header: Header{
 				"CSeq":          HeaderValue{"1"},
 				"Require":       HeaderValue{"implicit-play"},
@@ -47,7 +47,7 @@ var casesRequest = []struct {
 			"\r\n"),
 		Request{
 			Method: "DESCRIBE",
-			Url:    urlMustParse("rtsp://example.com/media.mp4"),
+			URL:    urlMustParse("rtsp://example.com/media.mp4"),
 			Header: Header{
 				"Accept": HeaderValue{"application/sdp"},
 				"CSeq":   HeaderValue{"2"},
@@ -62,7 +62,7 @@ var casesRequest = []struct {
 			"\r\n"),
 		Request{
 			Method: "DESCRIBE",
-			Url:    urlMustParse("rtsp://192.168.1.99:554/user=tmp&password=BagRep1!&channel=1&stream=0.sdp"),
+			URL:    urlMustParse("rtsp://192.168.1.99:554/user=tmp&password=BagRep1!&channel=1&stream=0.sdp"),
 			Header: Header{
 				"Accept": HeaderValue{"application/sdp"},
 				"CSeq":   HeaderValue{"3"},
@@ -91,7 +91,7 @@ var casesRequest = []struct {
 			"m=video 2232 RTP/AVP 31\n"),
 		Request{
 			Method: "ANNOUNCE",
-			Url:    urlMustParse("rtsp://example.com/media.mp4"),
+			URL:    urlMustParse("rtsp://example.com/media.mp4"),
 			Header: Header{
 				"CSeq":           HeaderValue{"7"},
 				"Date":           HeaderValue{"23 Jan 1997 15:35:06 GMT"},
@@ -125,7 +125,7 @@ var casesRequest = []struct {
 			"jitter\n"),
 		Request{
 			Method: "GET_PARAMETER",
-			Url:    urlMustParse("rtsp://example.com/media.mp4"),
+			URL:    urlMustParse("rtsp://example.com/media.mp4"),
 			Header: Header{
 				"CSeq":           HeaderValue{"9"},
 				"Content-Type":   HeaderValue{"text/parameters"},
diff --git a/connclient.go b/connclient.go
index 0e425161..7682a376 100644
--- a/connclient.go
+++ b/connclient.go
@@ -154,7 +154,7 @@ func (c *ConnClient) Close() error {
 	if c.state == connClientStateReading {
 		c.Do(&base.Request{
 			Method:       base.TEARDOWN,
-			Url:          c.streamUrl,
+			URL:          c.streamUrl,
 			SkipResponse: true,
 		})
 	}
@@ -281,11 +281,11 @@ func (c *ConnClient) Do(req *base.Request) (*base.Response, error) {
 	if c.auth != nil {
 		// remove credentials
 		u := &url.URL{
-			Scheme:   req.Url.Scheme,
-			Host:     req.Url.Host,
-			Path:     req.Url.Path,
-			RawPath:  req.Url.RawPath,
-			RawQuery: req.Url.RawQuery,
+			Scheme:   req.URL.Scheme,
+			Host:     req.URL.Host,
+			Path:     req.URL.Path,
+			RawPath:  req.URL.RawPath,
+			RawQuery: req.URL.RawQuery,
 		}
 		req.Header["Authorization"] = c.auth.GenerateHeader(req.Method, u)
 	}
@@ -334,9 +334,9 @@ func (c *ConnClient) Do(req *base.Request) (*base.Response, error) {
 	}
 
 	// setup authentication
-	if res.StatusCode == base.StatusUnauthorized && req.Url.User != nil && c.auth == nil {
-		pass, _ := req.Url.User.Password()
-		auth, err := auth.NewClient(res.Header["WWW-Authenticate"], req.Url.User.Username(), pass)
+	if res.StatusCode == base.StatusUnauthorized && req.URL.User != nil && c.auth == nil {
+		pass, _ := req.URL.User.Password()
+		auth, err := auth.NewClient(res.Header["WWW-Authenticate"], req.URL.User.Username(), pass)
 		if err != nil {
 			return nil, fmt.Errorf("unable to setup authentication: %s", err)
 		}
@@ -359,7 +359,7 @@ func (c *ConnClient) Options(u *url.URL) (*base.Response, error) {
 
 	res, err := c.Do(&base.Request{
 		Method: base.OPTIONS,
-		Url: &url.URL{
+		URL: &url.URL{
 			Scheme: "rtsp",
 			Host:   u.Host,
 			User:   u.User,
@@ -386,7 +386,7 @@ func (c *ConnClient) Describe(u *url.URL) (Tracks, *base.Response, error) {
 
 	res, err := c.Do(&base.Request{
 		Method: base.DESCRIBE,
-		Url:    u,
+		URL:    u,
 		Header: base.Header{
 			"Accept": base.HeaderValue{"application/sdp"},
 		},
@@ -471,7 +471,7 @@ func (c *ConnClient) urlForTrack(baseUrl *url.URL, mode TransportMode, track *Tr
 func (c *ConnClient) setup(u *url.URL, mode TransportMode, track *Track, ht *headers.Transport) (*base.Response, error) {
 	res, err := c.Do(&base.Request{
 		Method: base.SETUP,
-		Url:    c.urlForTrack(u, mode, track),
+		URL:    c.urlForTrack(u, mode, track),
 		Header: base.Header{
 			"Transport": ht.Write(),
 		},
@@ -677,7 +677,7 @@ func (c *ConnClient) Play(u *url.URL) (*base.Response, error) {
 
 	res, err := c.Do(&base.Request{
 		Method: base.PLAY,
-		Url:    u,
+		URL:    u,
 	})
 	if err != nil {
 		return nil, err
@@ -772,7 +772,7 @@ func (c *ConnClient) LoopUDP() error {
 			case <-keepaliveTicker.C:
 				_, err := c.Do(&base.Request{
 					Method: base.OPTIONS,
-					Url: &url.URL{
+					URL: &url.URL{
 						Scheme: "rtsp",
 						Host:   c.streamUrl.Host,
 						User:   c.streamUrl.User,
@@ -818,7 +818,7 @@ func (c *ConnClient) Announce(u *url.URL, tracks Tracks) (*base.Response, error)
 
 	res, err := c.Do(&base.Request{
 		Method: base.ANNOUNCE,
-		Url:    u,
+		URL:    u,
 		Header: base.Header{
 			"Content-Type": base.HeaderValue{"application/sdp"},
 		},
@@ -849,7 +849,7 @@ func (c *ConnClient) Record(u *url.URL) (*base.Response, error) {
 
 	res, err := c.Do(&base.Request{
 		Method: base.RECORD,
-		Url:    u,
+		URL:    u,
 	})
 	if err != nil {
 		return nil, err