src/pkg/math/big/int.go                        | 2 +-
 src/pkg/math/big/int_test.go                   | 2 +-
 src/pkg/math/big/nat.go                        | 2 +-
 src/pkg/math/big/rat_test.go                   | 2 +-
 src/pkg/mime/multipart/multipart_test.go       | 2 +-
 src/pkg/net/dnsclient.go                       | 2 +-
 src/pkg/net/dnsclient_unix.go                  | 2 +-
 src/pkg/net/http/cgi/child.go                  | 4 ++--
 src/pkg/net/http/cgi/host.go                   | 4 ++--
 src/pkg/net/http/cgi/host_test.go              | 6 +++---
 src/pkg/net/http/cgi/matryoshka_test.go        | 2 +-
 src/pkg/net/http/client.go                     | 2 +-
 src/pkg/net/http/client_test.go                | 6 +++---
 src/pkg/net/http/cookie_test.go                | 2 +-
 src/pkg/net/http/fcgi/child.go                 | 4 ++--
 src/pkg/net/http/filetransport_test.go         | 2 +-
 src/pkg/net/http/fs.go                         | 2 +-
 src/pkg/net/http/fs_test.go                    | 6 +++---
 src/pkg/net/http/httptest/recorder.go          | 2 +-
 src/pkg/net/http/httptest/server.go            | 2 +-
 src/pkg/net/http/httputil/chunked.go           | 2 +-
 src/pkg/net/http/httputil/dump.go              | 2 +-
 src/pkg/net/http/httputil/dump_test.go         | 4 ++--
 src/pkg/net/http/httputil/persist.go           | 2 +-
 src/pkg/net/http/httputil/reverseproxy.go      | 4 ++--
 src/pkg/net/http/httputil/reverseproxy_test.go | 6 +++---
 src/pkg/net/http/pprof/pprof.go                | 2 +-
 src/pkg/net/http/readrequest_test.go           | 2 +-
 src/pkg/net/http/request.go                    | 2 +-
 src/pkg/net/http/request_test.go               | 6 +++---
 src/pkg/net/http/requestwrite_test.go          | 2 +-
 src/pkg/net/http/response.go                   | 2 +-
 src/pkg/net/http/response_test.go              | 2 +-
 src/pkg/net/http/serve_test.go                 | 6 +++---
 src/pkg/net/http/server.go                     | 2 +-
 src/pkg/net/http/sniff_test.go                 | 4 ++--
 src/pkg/net/http/transport.go                  | 2 +-
 src/pkg/net/http/transport_test.go             | 6 +++---
 src/pkg/net/http/triv.go                       | 2 +-
 src/pkg/net/rpc/client.go                      | 4 ++--
 src/pkg/net/rpc/debug.go                       | 4 ++--
 src/pkg/net/rpc/jsonrpc/all_test.go            | 4 ++--
 src/pkg/net/rpc/jsonrpc/client.go              | 4 ++--
 src/pkg/net/rpc/jsonrpc/server.go              | 4 ++--
 src/pkg/net/rpc/server.go                      | 6 +++---
 src/pkg/net/rpc/server_test.go                 | 2 +-
 src/pkg/old/netchan/common.go                  | 2 +-
 src/pkg/old/regexp/regexp.go                   | 2 +-
 src/pkg/old/template/parse.go                  | 2 +-
 src/pkg/old/template/template_test.go          | 2 +-
 src/pkg/os/env_windows.go                      | 2 +-
 src/pkg/path/filepath/match.go                 | 2 +-
 src/pkg/path/match.go                          | 2 +-
 src/pkg/regexp/exec_test.go                    | 4 ++--
 src/pkg/regexp/regexp.go                       | 2 +-
 src/pkg/regexp/syntax/parse.go                 | 2 +-
 src/pkg/runtime/softfloat64_test.go            | 2 +-
 src/pkg/sort/sort_test.go                      | 2 +-
 src/pkg/strconv/quote.go                       | 2 +-
 src/pkg/strings/reader.go                      | 2 +-
 src/pkg/strings/strings.go                     | 2 +-
 src/pkg/strings/strings_test.go                | 2 +-
 src/pkg/syscall/exec_windows.go                | 2 +-
 src/pkg/syscall/syscall_windows.go             | 2 +-
 src/pkg/testing/quick/quick.go                 | 2 +-
 src/pkg/testing/quick/quick_test.go            | 2 +-
 src/pkg/testing/script/script.go               | 2 +-
 src/pkg/text/scanner/scanner.go                | 2 +-
 src/pkg/text/scanner/scanner_test.go           | 2 +-
 src/pkg/text/tabwriter/tabwriter.go            | 2 +-
 src/pkg/text/template/exec.go                  | 2 +-
 src/pkg/text/template/funcs.go                 | 4 ++--
 src/pkg/text/template/parse.go                 | 2 +-
 src/pkg/text/template/parse/lex.go             | 2 +-
 src/pkg/text/template/set.go                   | 2 +-
 src/pkg/unicode/maketables.go                  | 2 +-
 src/pkg/unicode/utf16/utf16_test.go            | 2 +-
 src/pkg/unicode/utf8/string_test.go            | 4 ++--
 src/pkg/unicode/utf8/utf8_test.go              | 2 +-
 src/pkg/websocket/client.go                    | 2 +-
 src/pkg/websocket/hixie.go                     | 6 +++---
 src/pkg/websocket/hixie_test.go                | 4 ++--
 src/pkg/websocket/hybi.go                      | 4 ++--
 src/pkg/websocket/hybi_test.go                 | 4 ++--
 src/pkg/websocket/server.go                    | 2 +-
 src/pkg/websocket/websocket.go                 | 6 +++---
 src/pkg/websocket/websocket_test.go            | 6 +++---

diff --git a/src/pkg/math/big/int.go b/src/pkg/math/big/int.go
index f325723804f7f337ac3e09449cc0b2309f1d76cb..533a97f7495012ff6a147695d19b02c25fa2cd61 100644
--- a/src/pkg/math/big/int.go
+++ b/src/pkg/math/big/int.go
@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"rand"
+	"math/rand"
 	"strings"
 )
 
diff --git a/src/pkg/math/big/int_test.go b/src/pkg/math/big/int_test.go
index d66bb5fa0530c877139a50f744213b79c3d3855f..163c662b0bbdf81bdab8b0d2b2906beffce61614 100644
--- a/src/pkg/math/big/int_test.go
+++ b/src/pkg/math/big/int_test.go
@@ -6,9 +6,9 @@ package big
 
 import (
 	"bytes"
+	"encoding/gob"
 	"encoding/hex"
 	"fmt"
-	"gob"
 	"testing"
 	"testing/quick"
 )
diff --git a/src/pkg/math/big/nat.go b/src/pkg/math/big/nat.go
index a46f782ac210e2c423c71ab23de37c9fd677a344..3fa41e7565f3114a72fcfb0cf0dbe5baecf70d03 100644
--- a/src/pkg/math/big/nat.go
+++ b/src/pkg/math/big/nat.go
@@ -21,7 +21,7 @@
 import (
 	"errors"
 	"io"
-	"rand"
+	"math/rand"
 )
 
 // An unsigned integer x of the form
diff --git a/src/pkg/math/big/rat_test.go b/src/pkg/math/big/rat_test.go
index 2443450411323d49e0672d99c92a16b341675b77..f7f31ae1a2024d01b21ca5d548b0db0dfd7a3857 100644
--- a/src/pkg/math/big/rat_test.go
+++ b/src/pkg/math/big/rat_test.go
@@ -6,8 +6,8 @@ package big
 
 import (
 	"bytes"
+	"encoding/gob"
 	"fmt"
-	"gob"
 	"testing"
 )
 
diff --git a/src/pkg/mime/multipart/multipart_test.go b/src/pkg/mime/multipart/multipart_test.go
index ce2a27c4413dd0c3edaa1760c0d7140ea095e0de..89ff5e489efd6c90fc11555d984dedb9097e4f0e 100644
--- a/src/pkg/mime/multipart/multipart_test.go
+++ b/src/pkg/mime/multipart/multipart_test.go
@@ -6,10 +6,10 @@ package multipart
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"json"
 	"strings"
 	"testing"
 )
diff --git a/src/pkg/net/dnsclient.go b/src/pkg/net/dnsclient.go
index e66f28c195c264b2c72a75faa30f6a734dd8fad4..f4ed8b87cc1322e19d857accafb112f4a71d0bde 100644
--- a/src/pkg/net/dnsclient.go
+++ b/src/pkg/net/dnsclient.go
@@ -7,7 +7,7 @@
 import (
 	"bytes"
 	"fmt"
-	"rand"
+	"math/rand"
 	"sort"
 )
 
diff --git a/src/pkg/net/dnsclient_unix.go b/src/pkg/net/dnsclient_unix.go
index e321ed9abef838b9c5c74061ecf817d5e7d89af8..bab5f2a9b6e94f4eb1258c2c6fa17e0c82b058f9 100644
--- a/src/pkg/net/dnsclient_unix.go
+++ b/src/pkg/net/dnsclient_unix.go
@@ -17,7 +17,7 @@
 package net
 
 import (
-	"rand"
+	"math/rand"
 	"sync"
 	"time"
 )
diff --git a/src/pkg/net/http/cgi/child.go b/src/pkg/net/http/cgi/child.go
index 1618268914aeeb5bcde2b11dfdbf654f1faf631f..e188cd4a25019a209b8c09383e519aab7c1f416a 100644
--- a/src/pkg/net/http/cgi/child.go
+++ b/src/pkg/net/http/cgi/child.go
@@ -12,14 +12,14 @@ 	"bufio"
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
 	"net"
+	"net/http"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
-	"url"
 )
 
 // Request returns the HTTP request as represented in the current
diff --git a/src/pkg/net/http/cgi/host.go b/src/pkg/net/http/cgi/host.go
index 8c999c0a36e57c2d53300688eb22b347d3b3d33a..615d366aedc3d8c71d2aebca47e32abf2998e7e1 100644
--- a/src/pkg/net/http/cgi/host.go
+++ b/src/pkg/net/http/cgi/host.go
@@ -16,12 +16,12 @@ package cgi
 
 import (
 	"bufio"
-	"exec"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"
diff --git a/src/pkg/net/http/cgi/host_test.go b/src/pkg/net/http/cgi/host_test.go
index fd0e0993713c541ef3371c44a432048d22b63356..635a85521e7beecc56cc88ba7751c234cc40149e 100644
--- a/src/pkg/net/http/cgi/host_test.go
+++ b/src/pkg/net/http/cgi/host_test.go
@@ -8,13 +8,13 @@ package cgi
 
 import (
 	"bufio"
-	"exec"
 	"fmt"
-	"http"
-	"http/httptest"
 	"io"
 	"net"
+	"net/http"
+	"net/http/httptest"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strconv"
diff --git a/src/pkg/net/http/cgi/matryoshka_test.go b/src/pkg/net/http/cgi/matryoshka_test.go
index 3e4a6addfa5dd182ff57bac33ed4cc0632954650..1a44df2040115ff8a935c03d16862ccd7f0f6e88 100644
--- a/src/pkg/net/http/cgi/matryoshka_test.go
+++ b/src/pkg/net/http/cgi/matryoshka_test.go
@@ -10,7 +10,7 @@ package cgi
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 	"os"
 	"testing"
 )
diff --git a/src/pkg/net/http/client.go b/src/pkg/net/http/client.go
index 17b4adc17ec585ede29d034eb4affa96bbf6e1e6..211ac44c58a9d92f5c4672d91d1029938acd7274 100644
--- a/src/pkg/net/http/client.go
+++ b/src/pkg/net/http/client.go
@@ -14,8 +14,8 @@ 	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
+	"net/url"
 	"strings"
-	"url"
 )
 
 // A Client is an HTTP client. Its zero value (DefaultClient) is a usable client
diff --git a/src/pkg/net/http/client_test.go b/src/pkg/net/http/client_test.go
index fdad2cdf54040f44f712ea06fe2f2abdba2a361d..d224380298c86663060c0c27f5b735e4707b471c 100644
--- a/src/pkg/net/http/client_test.go
+++ b/src/pkg/net/http/client_test.go
@@ -10,15 +10,15 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io"
 	"io/ioutil"
 	"net"
+	. "net/http"
+	"net/http/httptest"
+	"net/url"
 	"strconv"
 	"strings"
 	"testing"
-	"url"
 )
 
 var robotsTxtHandler = HandlerFunc(func(w ResponseWriter, r *Request) {
diff --git a/src/pkg/net/http/cookie_test.go b/src/pkg/net/http/cookie_test.go
index 9a537f90cb2c76f42cba86a4459594dca269d44d..24adf2029817e16c77d8b5b2a98fadda0334af44 100644
--- a/src/pkg/net/http/cookie_test.go
+++ b/src/pkg/net/http/cookie_test.go
@@ -5,8 +5,8 @@
 package http
 
 import (
+	"encoding/json"
 	"fmt"
-	"json"
 	"reflect"
 	"testing"
 	"time"
diff --git a/src/pkg/net/http/fcgi/child.go b/src/pkg/net/http/fcgi/child.go
index f6591e081e4c8b364153e57ad39cfe25a2d93b96..7b563951ccf202a4287b3ff376e40934e61c75d9 100644
--- a/src/pkg/net/http/fcgi/child.go
+++ b/src/pkg/net/http/fcgi/child.go
@@ -8,10 +8,10 @@ // This file implements FastCGI from the perspective of a child process.
 
 import (
 	"fmt"
-	"http"
-	"http/cgi"
 	"io"
 	"net"
+	"net/http"
+	"net/http/cgi"
 	"os"
 	"time"
 )
diff --git a/src/pkg/net/http/filetransport_test.go b/src/pkg/net/http/filetransport_test.go
index aaee73e9c3c3b8a958ef24a714cb2160406fa469..265a3b903e94b975ded227d5f753678f7d883ffc 100644
--- a/src/pkg/net/http/filetransport_test.go
+++ b/src/pkg/net/http/filetransport_test.go
@@ -5,8 +5,8 @@
 package http_test
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"path/filepath"
 	"testing"
 )
diff --git a/src/pkg/net/http/fs.go b/src/pkg/net/http/fs.go
index eb0c67dfa198e8012b85618d7d5587d814c03b55..5f91ff5cbf659122eb4faa80c213030818e7c20d 100644
--- a/src/pkg/net/http/fs.go
+++ b/src/pkg/net/http/fs.go
@@ -17,7 +17,7 @@ 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Dir implements http.FileSystem using the native file
diff --git a/src/pkg/net/http/fs_test.go b/src/pkg/net/http/fs_test.go
index 76312e8bf0243f663cea8345975fb002b8845431..e1a784c1f6d191776824617c1c5b94160bb7e80b 100644
--- a/src/pkg/net/http/fs_test.go
+++ b/src/pkg/net/http/fs_test.go
@@ -6,14 +6,14 @@ package http_test
 
 import (
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io/ioutil"
+	. "net/http"
+	"net/http/httptest"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
-	"url"
 )
 
 const (
diff --git a/src/pkg/net/http/httptest/recorder.go b/src/pkg/net/http/httptest/recorder.go
index f69279f7c1c037c94e0ceef9099508cd402778d4..9aa0d510bd4d57906ee7d7d5357b545a1b172d70 100644
--- a/src/pkg/net/http/httptest/recorder.go
+++ b/src/pkg/net/http/httptest/recorder.go
@@ -7,7 +7,7 @@ package httptest
 
 import (
 	"bytes"
-	"http"
+	"net/http"
 )
 
 // ResponseRecorder is an implementation of http.ResponseWriter that
diff --git a/src/pkg/net/http/httptest/server.go b/src/pkg/net/http/httptest/server.go
index ea719cfbd560ef9742b606d2275d4b0c4e7a164e..f09e826d9c9bbfdf8072ac48666fc3f2f7696322 100644
--- a/src/pkg/net/http/httptest/server.go
+++ b/src/pkg/net/http/httptest/server.go
@@ -11,8 +11,8 @@ 	"crypto/rand"
 	"crypto/tls"
 	"flag"
 	"fmt"
-	"http"
 	"net"
+	"net/http"
 	"os"
 	"time"
 )
diff --git a/src/pkg/net/http/httputil/chunked.go b/src/pkg/net/http/httputil/chunked.go
index 828669208661f77e0a24512b5c649211218ea652..34e47c796c19ce5afcd6a88dae29933c91f067aa 100644
--- a/src/pkg/net/http/httputil/chunked.go
+++ b/src/pkg/net/http/httputil/chunked.go
@@ -6,8 +6,8 @@ package httputil
 
 import (
 	"bufio"
-	"http"
 	"io"
+	"net/http"
 	"strconv"
 	"strings"
 )
diff --git a/src/pkg/net/http/httputil/dump.go b/src/pkg/net/http/httputil/dump.go
index 5b861b7dc38c263646655815974e7b02a4a02c60..31696aec86ed7b903c2a48f82a8514b1833608d9 100644
--- a/src/pkg/net/http/httputil/dump.go
+++ b/src/pkg/net/http/httputil/dump.go
@@ -8,10 +8,10 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
 	"net"
+	"net/http"
 	"strings"
 )
 
diff --git a/src/pkg/net/http/httputil/dump_test.go b/src/pkg/net/http/httputil/dump_test.go
index b9856ce94e8be00dfd48c991f238d5fb24ef732f..819efb5847bd1f4dbed695f79d995acd5613a49f 100644
--- a/src/pkg/net/http/httputil/dump_test.go
+++ b/src/pkg/net/http/httputil/dump_test.go
@@ -7,11 +7,11 @@
 import (
 	"bytes"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"net/url"
 	"testing"
-	"url"
 )
 
 type dumpTest struct {
diff --git a/src/pkg/net/http/httputil/persist.go b/src/pkg/net/http/httputil/persist.go
index 5d22cdd4ab7386c8c94332ddb31e38f45b0c02fc..d7b670110c4bcffc1532f889be5791c719d3ed92 100644
--- a/src/pkg/net/http/httputil/persist.go
+++ b/src/pkg/net/http/httputil/persist.go
@@ -9,9 +9,9 @@
 import (
 	"bufio"
 	"errors"
-	"http"
 	"io"
 	"net"
+	"net/http"
 	"net/textproto"
 	"os"
 	"sync"
diff --git a/src/pkg/net/http/httputil/reverseproxy.go b/src/pkg/net/http/httputil/reverseproxy.go
index 1c5a4463a002912363ee3343ac85b1ff9195bebf..bfcb3ca6b111d247dde7b43a92e0c338b893f78f 100644
--- a/src/pkg/net/http/httputil/reverseproxy.go
+++ b/src/pkg/net/http/httputil/reverseproxy.go
@@ -7,14 +7,14 @@
 package httputil
 
 import (
-	"http"
 	"io"
 	"log"
 	"net"
+	"net/http"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
-	"url"
 )
 
 // ReverseProxy is an HTTP Handler that takes an incoming request and
diff --git a/src/pkg/net/http/httputil/reverseproxy_test.go b/src/pkg/net/http/httputil/reverseproxy_test.go
index d76829a3c59b296fc25390994fa6346f3ee46999..655784b30d5f195d7603ffde0b0dac3247df2027 100644
--- a/src/pkg/net/http/httputil/reverseproxy_test.go
+++ b/src/pkg/net/http/httputil/reverseproxy_test.go
@@ -7,11 +7,11 @@
 package httputil
 
 import (
-	"http"
-	"http/httptest"
 	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
 	"testing"
-	"url"
 )
 
 func TestReverseProxy(t *testing.T) {
diff --git a/src/pkg/net/http/pprof/pprof.go b/src/pkg/net/http/pprof/pprof.go
index a118a259b6ad3e4d70f413f74f43cd0772855a3c..c0327a948244cf08bf081b1487894afce99fa725 100644
--- a/src/pkg/net/http/pprof/pprof.go
+++ b/src/pkg/net/http/pprof/pprof.go
@@ -28,8 +28,8 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
 	"os"
 	"runtime"
 	"runtime/pprof"
diff --git a/src/pkg/net/http/readrequest_test.go b/src/pkg/net/http/readrequest_test.go
index 524b208dbafb5475d8cae471ddaeb95299a5899c..2219d43316593b73439f5544de48a67e6d98b1fb 100644
--- a/src/pkg/net/http/readrequest_test.go
+++ b/src/pkg/net/http/readrequest_test.go
@@ -9,9 +9,9 @@ 	"bufio"
 	"bytes"
 	"fmt"
 	"io"
+	"net/url"
 	"reflect"
 	"testing"
-	"url"
 )
 
 type reqTest struct {
diff --git a/src/pkg/net/http/request.go b/src/pkg/net/http/request.go
index 0cf1224ddb4ab55501251946ca523a6958afeff0..4410ca1d11ceec8c9bc925a8c3b984556771bcba 100644
--- a/src/pkg/net/http/request.go
+++ b/src/pkg/net/http/request.go
@@ -18,9 +18,9 @@ 	"io/ioutil"
 	"mime"
 	"mime/multipart"
 	"net/textproto"
+	"net/url"
 	"strconv"
 	"strings"
-	"url"
 )
 
 const (
diff --git a/src/pkg/net/http/request_test.go b/src/pkg/net/http/request_test.go
index d6487e1974e1705998153165f6ed8a1ed7d11105..714cb64f47f1b64ff3db51f310a97a053748dfea 100644
--- a/src/pkg/net/http/request_test.go
+++ b/src/pkg/net/http/request_test.go
@@ -7,17 +7,17 @@
 import (
 	"bytes"
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
+	. "net/http"
+	"net/http/httptest"
+	"net/url"
 	"os"
 	"reflect"
 	"regexp"
 	"strings"
 	"testing"
-	"url"
 )
 
 func TestQuery(t *testing.T) {
diff --git a/src/pkg/net/http/requestwrite_test.go b/src/pkg/net/http/requestwrite_test.go
index 3da8ad719b80526d215d3372912f70fb3aac20d6..8081589f5f25d8fc505b6ab1bf2ad0abe0f9ca66 100644
--- a/src/pkg/net/http/requestwrite_test.go
+++ b/src/pkg/net/http/requestwrite_test.go
@@ -10,9 +10,9 @@ 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 type reqWriteTest struct {
diff --git a/src/pkg/net/http/response.go b/src/pkg/net/http/response.go
index 7be7150ef134ab057ccacc442a9069b379047ff1..ae314b5ac934bfa942884a4ce96489458716684f 100644
--- a/src/pkg/net/http/response.go
+++ b/src/pkg/net/http/response.go
@@ -11,9 +11,9 @@ 	"bufio"
 	"errors"
 	"io"
 	"net/textproto"
+	"net/url"
 	"strconv"
 	"strings"
-	"url"
 )
 
 var respExcludeHeader = map[string]bool{
diff --git a/src/pkg/net/http/response_test.go b/src/pkg/net/http/response_test.go
index 6a141796bbbd4eb6f5b7bc8ae9960a54eca3cb43..be717aa83c3c586b9ca0f38de6dabdfe00ee67c9 100644
--- a/src/pkg/net/http/response_test.go
+++ b/src/pkg/net/http/response_test.go
@@ -12,9 +12,9 @@ 	"crypto/rand"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/url"
 	"reflect"
 	"testing"
-	"url"
 )
 
 type respTest struct {
diff --git a/src/pkg/net/http/serve_test.go b/src/pkg/net/http/serve_test.go
index fac2f5afedc2ee1fc78536d3c7f85a2c786ad8a9..e278396091d590c98575de12e305cb26b07943bd 100644
--- a/src/pkg/net/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
@@ -11,20 +11,20 @@ 	"bufio"
 	"bytes"
 	"crypto/tls"
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io"
 	"io/ioutil"
 	"log"
 	"net"
+	. "net/http"
+	"net/http/httptest"
 	"net/http/httputil"
+	"net/url"
 	"os"
 	"reflect"
 	"strings"
 	"syscall"
 	"testing"
 	"time"
-	"url"
 )
 
 type dummyAddr string
diff --git a/src/pkg/net/http/server.go b/src/pkg/net/http/server.go
index f2a4f01ad8f0040de35affc0e5a8afb024156d51..8c4889436f1c6006dd8d52f31bf00305719de9f6 100644
--- a/src/pkg/net/http/server.go
+++ b/src/pkg/net/http/server.go
@@ -20,13 +20,13 @@ 	"io"
 	"io/ioutil"
 	"log"
 	"net"
+	"net/url"
 	"path"
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-	"url"
 )
 
 // Errors introduced by the HTTP server.
diff --git a/src/pkg/net/http/sniff_test.go b/src/pkg/net/http/sniff_test.go
index e9195a5e164de8a2fa44f4ccd90f492fadaaced2..a414e6420db88c39058cfd6b2f59d1faeb6214b7 100644
--- a/src/pkg/net/http/sniff_test.go
+++ b/src/pkg/net/http/sniff_test.go
@@ -6,10 +6,10 @@ package http_test
 
 import (
 	"bytes"
-	. "http"
-	"http/httptest"
 	"io/ioutil"
 	"log"
+	. "net/http"
+	"net/http/httptest"
 	"strconv"
 	"testing"
 )
diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go
index 5e167fef8e444bf29f10a401621a41520aa3b62f..da5244b2c12ed0e7ea18b9f4015733069bc543a2 100644
--- a/src/pkg/net/http/transport.go
+++ b/src/pkg/net/http/transport.go
@@ -20,10 +20,10 @@ 	"io"
 	"io/ioutil"
 	"log"
 	"net"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
-	"url"
 )
 
 // DefaultTransport is the default implementation of Transport and is
diff --git a/src/pkg/net/http/transport_test.go b/src/pkg/net/http/transport_test.go
index b2d0ebaf6b33a7558974934f6e4a8c4f83537581..772979724492bd20d020f5076f19251067aa3c95 100644
--- a/src/pkg/net/http/transport_test.go
+++ b/src/pkg/net/http/transport_test.go
@@ -11,15 +11,15 @@ 	"bytes"
 	"compress/gzip"
 	"crypto/rand"
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io"
 	"io/ioutil"
+	. "net/http"
+	"net/http/httptest"
+	"net/url"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
-	"url"
 )
 
 // TODO: test 5 pipelined requests with responses: 1) OK, 2) OK, Connection: Close
diff --git a/src/pkg/net/http/triv.go b/src/pkg/net/http/triv.go
index a8fd99aa4be3c02669dc1fa7035a056ea9511a1d..994fc0e32f64df97943f30e25fb747d95cbcdfb1 100644
--- a/src/pkg/net/http/triv.go
+++ b/src/pkg/net/http/triv.go
@@ -9,9 +9,9 @@ 	"bytes"
 	"expvar"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"strconv"
 )
diff --git a/src/pkg/net/rpc/client.go b/src/pkg/net/rpc/client.go
index ecc84decf2bf92e8e7e286d2fb6157330afb4bc6..6fb414e089cdeb9b25d0e00a8b0e85138af9019a 100644
--- a/src/pkg/net/rpc/client.go
+++ b/src/pkg/net/rpc/client.go
@@ -6,12 +6,12 @@ package rpc
 
 import (
 	"bufio"
+	"encoding/gob"
 	"errors"
-	"gob"
-	"http"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"sync"
 )
 
diff --git a/src/pkg/net/rpc/debug.go b/src/pkg/net/rpc/debug.go
index 02d577f6779a2126cfcccd1d3549c787cd696941..663663fe941f72f34a39cfb19cf112e6b3cb473e 100644
--- a/src/pkg/net/rpc/debug.go
+++ b/src/pkg/net/rpc/debug.go
@@ -11,9 +11,9 @@ */
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 	"sort"
-	"template"
+	"text/template"
 )
 
 const debugText = `<html>
diff --git a/src/pkg/net/rpc/jsonrpc/all_test.go b/src/pkg/net/rpc/jsonrpc/all_test.go
index 1451a0fed8a0ae0163fe7430d2fb46a9acc2cae4..e6c7441f06b0a6bfde10ed7a7cc98e595363b385 100644
--- a/src/pkg/net/rpc/jsonrpc/all_test.go
+++ b/src/pkg/net/rpc/jsonrpc/all_test.go
@@ -5,12 +5,12 @@
 package jsonrpc
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
-	"json"
 	"net"
-	"rpc"
+	"net/rpc"
 	"testing"
 )
 
diff --git a/src/pkg/net/rpc/jsonrpc/client.go b/src/pkg/net/rpc/jsonrpc/client.go
index f0475f060a62c04a862d489490ca93993ed31885..3fa8cbf08a37bfb53308d6deaa6fd10f7e8a88d6 100644
--- a/src/pkg/net/rpc/jsonrpc/client.go
+++ b/src/pkg/net/rpc/jsonrpc/client.go
@@ -7,11 +7,11 @@ // for the rpc package.
 package jsonrpc
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
-	"json"
 	"net"
-	"rpc"
+	"net/rpc"
 	"sync"
 )
 
diff --git a/src/pkg/net/rpc/jsonrpc/server.go b/src/pkg/net/rpc/jsonrpc/server.go
index 9fe3470c02e80c46058878cf5205fa53d17a18c8..4c54553a7238f583201e86bc4c0584f13dacc324 100644
--- a/src/pkg/net/rpc/jsonrpc/server.go
+++ b/src/pkg/net/rpc/jsonrpc/server.go
@@ -5,10 +5,10 @@
 package jsonrpc
 
 import (
+	"encoding/json"
 	"errors"
 	"io"
-	"json"
-	"rpc"
+	"net/rpc"
 	"sync"
 )
 
diff --git a/src/pkg/net/rpc/server.go b/src/pkg/net/rpc/server.go
index d03153305cc50038fb8356316eafafbef1025a29..920ae9137a676cd06a7426dd166328cd3c882bb9 100644
--- a/src/pkg/net/rpc/server.go
+++ b/src/pkg/net/rpc/server.go
@@ -114,17 +114,17 @@ package rpc
 
 import (
 	"bufio"
+	"encoding/gob"
 	"errors"
-	"gob"
-	"http"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"reflect"
 	"strings"
 	"sync"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 const (
diff --git a/src/pkg/net/rpc/server_test.go b/src/pkg/net/rpc/server_test.go
index 119de7f89b3278ca8c53b83b1a3df48056a67c83..f2895217aafa3886f8d9fe5bd37a493d70371900 100644
--- a/src/pkg/net/rpc/server_test.go
+++ b/src/pkg/net/rpc/server_test.go
@@ -7,10 +7,10 @@
 import (
 	"errors"
 	"fmt"
-	"http/httptest"
 	"io"
 	"log"
 	"net"
+	"net/http/httptest"
 	"runtime"
 	"strings"
 	"sync"
diff --git a/src/pkg/old/netchan/common.go b/src/pkg/old/netchan/common.go
index 855b7175f7b936bf867ca2ab284c5455e59efb7c..dfd1fd03427c97fcc3268f3bb6a7d9574f3a6067 100644
--- a/src/pkg/old/netchan/common.go
+++ b/src/pkg/old/netchan/common.go
@@ -5,8 +5,8 @@
 package netchan
 
 import (
+	"encoding/gob"
 	"errors"
-	"gob"
 	"io"
 	"reflect"
 	"sync"
diff --git a/src/pkg/old/regexp/regexp.go b/src/pkg/old/regexp/regexp.go
index 720aaf36e4954fa68191389225c053b0e389eafc..86df4dedd9a2d6f6e244e42aefc31f1a7ea5e137 100644
--- a/src/pkg/old/regexp/regexp.go
+++ b/src/pkg/old/regexp/regexp.go
@@ -72,7 +72,7 @@ import (
 	"bytes"
 	"io"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var debug = false
diff --git a/src/pkg/old/template/parse.go b/src/pkg/old/template/parse.go
index fc9885feef731761a08e778664a03823afa09a26..b8c806472ee775bc83574778357f0509ce5d9a0a 100644
--- a/src/pkg/old/template/parse.go
+++ b/src/pkg/old/template/parse.go
@@ -14,7 +14,7 @@ 	"reflect"
 	"strconv"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Errors returned during parsing and execution.  Users may extract the information and reformat
diff --git a/src/pkg/old/template/template_test.go b/src/pkg/old/template/template_test.go
index c88346995a85c7f3f318c37af5cc529ca2004fbb..9462c7ee3cf9e03d39ec97d711054987ac8c501d 100644
--- a/src/pkg/old/template/template_test.go
+++ b/src/pkg/old/template/template_test.go
@@ -6,10 +6,10 @@ package template
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"json"
 	"strings"
 	"testing"
 )
diff --git a/src/pkg/os/env_windows.go b/src/pkg/os/env_windows.go
index ad6c8e306cf61cc9598de730f0f2679c713118e3..4e90385da96dc69b98882b9a24b266695fa9e969 100644
--- a/src/pkg/os/env_windows.go
+++ b/src/pkg/os/env_windows.go
@@ -9,8 +9,8 @@
 import (
 	"errors"
 	"syscall"
+	"unicode/utf16"
 	"unsafe"
-	"utf16"
 )
 
 // ENOENV is the error indicating that an environment variable does not exist.
diff --git a/src/pkg/path/filepath/match.go b/src/pkg/path/filepath/match.go
index bc0930e98b0592209d812a13110910b8d22704d0..8cf1f9ad1076c2610830edc9c4d9ac1b75f004d5 100644
--- a/src/pkg/path/filepath/match.go
+++ b/src/pkg/path/filepath/match.go
@@ -9,7 +9,7 @@ 	"errors"
 	"os"
 	"sort"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var ErrBadPattern = errors.New("syntax error in pattern")
diff --git a/src/pkg/path/match.go b/src/pkg/path/match.go
index bc685f48fbc15a4965d5828fc0c9b7012eb16f7b..ba7e4de321e3353ec0afa9813a44841538cfe60b 100644
--- a/src/pkg/path/match.go
+++ b/src/pkg/path/match.go
@@ -7,7 +7,7 @@
 import (
 	"errors"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var ErrBadPattern = errors.New("syntax error in pattern")
diff --git a/src/pkg/regexp/exec_test.go b/src/pkg/regexp/exec_test.go
index 499d1a529f7ee54a24569d326f9c1b14f67d6991..d981f5495e7fa2813e32e5ad81713350d3739771 100644
--- a/src/pkg/regexp/exec_test.go
+++ b/src/pkg/regexp/exec_test.go
@@ -9,15 +9,15 @@ 	"bufio"
 	"compress/bzip2"
 	"fmt"
 	"io"
+	"math/rand"
 	old "old/regexp"
 	"os"
 	"path/filepath"
-	"rand"
 	"regexp/syntax"
 	"strconv"
 	"strings"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 // TestRE2 tests this package's regexp API against test cases
diff --git a/src/pkg/regexp/regexp.go b/src/pkg/regexp/regexp.go
index 9e9fb856dc03ae83c2dc233a36cd3ece1a979430..b906076f9eb270a11237ac444b7a478620934916 100644
--- a/src/pkg/regexp/regexp.go
+++ b/src/pkg/regexp/regexp.go
@@ -60,7 +60,7 @@ 	"regexp/syntax"
 	"strconv"
 	"strings"
 	"sync"
-	"utf8"
+	"unicode/utf8"
 )
 
 var debug = false
diff --git a/src/pkg/regexp/syntax/parse.go b/src/pkg/regexp/syntax/parse.go
index 29ad4d2f89a563c218888b2d8e82dc49f3acf9e3..6c37df97078e0220fed30eb2f50770969fe188fb 100644
--- a/src/pkg/regexp/syntax/parse.go
+++ b/src/pkg/regexp/syntax/parse.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // An Error describes a failure to parse a regular expression
diff --git a/src/pkg/runtime/softfloat64_test.go b/src/pkg/runtime/softfloat64_test.go
index fb7f3d3c00c59ede1f2f3a102b39261972418bf1..df63010fbd5e9b0b55cedee8b9af302c10f0b424 100644
--- a/src/pkg/runtime/softfloat64_test.go
+++ b/src/pkg/runtime/softfloat64_test.go
@@ -6,7 +6,7 @@ package runtime_test
 
 import (
 	"math"
-	"rand"
+	"math/rand"
 	. "runtime"
 	"testing"
 )
diff --git a/src/pkg/sort/sort_test.go b/src/pkg/sort/sort_test.go
index a5640151cb28d5eb968489f3244904d3600499ba..ee8a9d0e8499f2f38bf9d10ece6c229f1e0386f9 100644
--- a/src/pkg/sort/sort_test.go
+++ b/src/pkg/sort/sort_test.go
@@ -7,7 +7,7 @@
 import (
 	"fmt"
 	"math"
-	"rand"
+	"math/rand"
 	. "sort"
 	"strconv"
 	"testing"
diff --git a/src/pkg/strconv/quote.go b/src/pkg/strconv/quote.go
index 24b19be383608f611c55219fc2192e0e15256446..9b48c07fb1d7a29187e9e86074ba4c27a6a0d21d 100644
--- a/src/pkg/strconv/quote.go
+++ b/src/pkg/strconv/quote.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 const lowerhex = "0123456789abcdef"
diff --git a/src/pkg/strings/reader.go b/src/pkg/strings/reader.go
index 4f24b5b63806d8a14934fa9d0a913217c25a66df..8ff851f36a8c055a5fe0a78fdc87bf3c3b6ef675 100644
--- a/src/pkg/strings/reader.go
+++ b/src/pkg/strings/reader.go
@@ -7,7 +7,7 @@
 import (
 	"errors"
 	"io"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Reader implements the io.Reader, io.ByteScanner, and
diff --git a/src/pkg/strings/strings.go b/src/pkg/strings/strings.go
index 4f6e8a6fe3e3e2f7c09957aedc8b7a7988391157..b4d920714ac4ef5662e6ffd22773023414e08a3e 100644
--- a/src/pkg/strings/strings.go
+++ b/src/pkg/strings/strings.go
@@ -7,7 +7,7 @@ package strings
 
 import (
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // explode splits s into an array of UTF-8 sequences, one per Unicode character (still strings) up to a maximum of n (n < 0 means no limit).
diff --git a/src/pkg/strings/strings_test.go b/src/pkg/strings/strings_test.go
index 2cf4bdec13a00700cb105fce3afddafc1d60124c..304d69a19d70f09cfb0d652fedac3d750eb614f2 100644
--- a/src/pkg/strings/strings_test.go
+++ b/src/pkg/strings/strings_test.go
@@ -12,8 +12,8 @@ 	"strconv"
 	. "strings"
 	"testing"
 	"unicode"
+	"unicode/utf8"
 	"unsafe"
-	"utf8"
 )
 
 func eq(a, b []string) bool {
diff --git a/src/pkg/syscall/exec_windows.go b/src/pkg/syscall/exec_windows.go
index e4fafdb9924a5411abfc76b9de0dea70160f1231..56eeb52da7ad69851dfd08e12744182f5bcb6ef0 100644
--- a/src/pkg/syscall/exec_windows.go
+++ b/src/pkg/syscall/exec_windows.go
@@ -8,8 +8,8 @@ package syscall
 
 import (
 	"sync"
+	"unicode/utf16"
 	"unsafe"
-	"utf16"
 )
 
 var ForkLock sync.RWMutex
diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index ea62df6a1f228a3d50cfec10b7656bbaa8b51491..124cdf9faf5cf15f8a94cbccbfd046218d10c680 100644
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -7,8 +7,8 @@
 package syscall
 
 import (
+	"unicode/utf16"
 	"unsafe"
-	"utf16"
 )
 
 const OS = "windows"
diff --git a/src/pkg/testing/quick/quick.go b/src/pkg/testing/quick/quick.go
index 9e6b84bc29b7bd22ad982aac4a592033575264b6..f94c541f2ba63cef174bd774f482837fc002265c 100644
--- a/src/pkg/testing/quick/quick.go
+++ b/src/pkg/testing/quick/quick.go
@@ -9,7 +9,7 @@ import (
 	"flag"
 	"fmt"
 	"math"
-	"rand"
+	"math/rand"
 	"reflect"
 	"strings"
 )
diff --git a/src/pkg/testing/quick/quick_test.go b/src/pkg/testing/quick/quick_test.go
index e9ff1aa449a134d1e371030a1d5101bfc18c2078..a6cf0dc3968b4cec9f865e65f639038412223172 100644
--- a/src/pkg/testing/quick/quick_test.go
+++ b/src/pkg/testing/quick/quick_test.go
@@ -5,7 +5,7 @@
 package quick
 
 import (
-	"rand"
+	"math/rand"
 	"reflect"
 	"testing"
 )
diff --git a/src/pkg/testing/script/script.go b/src/pkg/testing/script/script.go
index 98f3625198375968a8775ab777b410b61471c2ad..d8f8093af9034006c604733e8f274e1e5f26155e 100644
--- a/src/pkg/testing/script/script.go
+++ b/src/pkg/testing/script/script.go
@@ -7,7 +7,7 @@ package script
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 	"reflect"
 	"strings"
 )
diff --git a/src/pkg/text/scanner/scanner.go b/src/pkg/text/scanner/scanner.go
index 9e230174ca0cfed00d594caa9a8feb31c7ac8b9f..f46f63d0ee6b438aa374c7b0727c9f4298b035a5 100644
--- a/src/pkg/text/scanner/scanner.go
+++ b/src/pkg/text/scanner/scanner.go
@@ -31,7 +31,7 @@ 	"fmt"
 	"io"
 	"os"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // TODO(gri): Consider changing this to use the new (token) Position package.
diff --git a/src/pkg/text/scanner/scanner_test.go b/src/pkg/text/scanner/scanner_test.go
index b07e559e1a6d12e05d73be455a5f179490ff9120..bb3adb55a77fdf2617a63d8d7319012970fd00f2 100644
--- a/src/pkg/text/scanner/scanner_test.go
+++ b/src/pkg/text/scanner/scanner_test.go
@@ -10,7 +10,7 @@ 	"fmt"
 	"io"
 	"strings"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A StringReader delivers its data one string segment at a time via Read.
diff --git a/src/pkg/text/tabwriter/tabwriter.go b/src/pkg/text/tabwriter/tabwriter.go
index d588b385d2e88ade3f96d9dd33f33ab4887e3ee1..c136ca2a175c060aae4f0942c79d3052d82c011c 100644
--- a/src/pkg/text/tabwriter/tabwriter.go
+++ b/src/pkg/text/tabwriter/tabwriter.go
@@ -14,7 +14,7 @@ import (
 	"bytes"
 	"io"
 	"os"
-	"utf8"
+	"unicode/utf8"
 )
 
 // ----------------------------------------------------------------------------
diff --git a/src/pkg/text/template/exec.go b/src/pkg/text/template/exec.go
index 8ebd52bf3f84b67fa0247efd2cd23d5edaeac37c..19108825d58d9558524b5b13c8e67f99158b3964 100644
--- a/src/pkg/text/template/exec.go
+++ b/src/pkg/text/template/exec.go
@@ -10,7 +10,7 @@ 	"io"
 	"reflect"
 	"runtime"
 	"strings"
-	"template/parse"
+	"text/template/parse"
 )
 
 // state represents the state of an execution. It's not part of the
diff --git a/src/pkg/text/template/funcs.go b/src/pkg/text/template/funcs.go
index 1eff7165faf3871fc820ba377af1123f417870af..2ca09a7c17f15c481e09a4fc0a9f8f87d330e0b5 100644
--- a/src/pkg/text/template/funcs.go
+++ b/src/pkg/text/template/funcs.go
@@ -8,11 +8,11 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"net/url"
 	"reflect"
 	"strings"
 	"unicode"
-	"url"
-	"utf8"
+	"unicode/utf8"
 )
 
 // FuncMap is the type of the map defining the mapping from names to functions.
diff --git a/src/pkg/text/template/parse.go b/src/pkg/text/template/parse.go
index 6ecd2f50b49eeeae9e6598b3fbd24dce56fed4b5..fa562141c29f28852cdd2e274f748bc633241563 100644
--- a/src/pkg/text/template/parse.go
+++ b/src/pkg/text/template/parse.go
@@ -6,7 +6,7 @@ package template
 
 import (
 	"reflect"
-	"template/parse"
+	"text/template/parse"
 )
 
 // Template is the representation of a parsed template.
diff --git a/src/pkg/text/template/parse/lex.go b/src/pkg/text/template/parse/lex.go
index 04c105d16104ecc5b5e15fbfb7681c665c23831e..97c19a160b005b899e3527947f21e7fb62d23bfd 100644
--- a/src/pkg/text/template/parse/lex.go
+++ b/src/pkg/text/template/parse/lex.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // item represents a token or text string returned from the scanner.
diff --git a/src/pkg/text/template/set.go b/src/pkg/text/template/set.go
index ba5dc005446bb0309e5d8a11ac7222065a7c1acf..747cc7802b434262de99915af1241dea8c2fcfb7 100644
--- a/src/pkg/text/template/set.go
+++ b/src/pkg/text/template/set.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"io"
 	"reflect"
-	"template/parse"
+	"text/template/parse"
 )
 
 // Set holds a set of related templates that can refer to one another by name.
diff --git a/src/pkg/unicode/maketables.go b/src/pkg/unicode/maketables.go
index 8f511fa53fad9329cc38f6dc4d60f8042b3e1466..a405da30766900572833d41b0c8938ecb2373e4d 100644
--- a/src/pkg/unicode/maketables.go
+++ b/src/pkg/unicode/maketables.go
@@ -11,9 +11,9 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"
diff --git a/src/pkg/unicode/utf16/utf16_test.go b/src/pkg/unicode/utf16/utf16_test.go
index 7ea290a52999ebfd23792a28efa82e84b9339586..d453b2f984d1b2604ba9de79a934dd24703ee3c1 100644
--- a/src/pkg/unicode/utf16/utf16_test.go
+++ b/src/pkg/unicode/utf16/utf16_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 	"unicode"
-	. "utf16"
+	. "unicode/utf16"
 )
 
 type encodeTest struct {
diff --git a/src/pkg/unicode/utf8/string_test.go b/src/pkg/unicode/utf8/string_test.go
index 920d2a0ea31c5f13e5be0bb84d21e602eff7d612..2c139bea98cd8ba275e54b906d883c130d24b77a 100644
--- a/src/pkg/unicode/utf8/string_test.go
+++ b/src/pkg/unicode/utf8/string_test.go
@@ -5,9 +5,9 @@
 package utf8_test
 
 import (
-	"rand"
+	"math/rand"
 	"testing"
-	. "utf8"
+	. "unicode/utf8"
 )
 
 func TestScanForwards(t *testing.T) {
diff --git a/src/pkg/unicode/utf8/utf8_test.go b/src/pkg/unicode/utf8/utf8_test.go
index 857bcf6e1a67c1b8b9dd95e1d52d0eac54af7dcb..63514265bb9187e5ca02509d6c5db672bfbed9ef 100644
--- a/src/pkg/unicode/utf8/utf8_test.go
+++ b/src/pkg/unicode/utf8/utf8_test.go
@@ -7,7 +7,7 @@
 import (
 	"bytes"
 	"testing"
-	. "utf8"
+	. "unicode/utf8"
 )
 
 type Utf8Map struct {
diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go
index 3da39a0ce476bae803a26b5857ae71f6b290e0b8..5dfd824e6e5b9a110f0ae5fd20872b7f2ee81672 100644
--- a/src/pkg/websocket/client.go
+++ b/src/pkg/websocket/client.go
@@ -9,7 +9,7 @@ 	"bufio"
 	"crypto/tls"
 	"io"
 	"net"
-	"url"
+	"net/url"
 )
 
 // DialError is an error that occurs while dialling a websocket server.
diff --git a/src/pkg/websocket/hixie.go b/src/pkg/websocket/hixie.go
index 63eebc9502071bdf9228e1edb4479c3540711204..4d5360ff4b9fecc9b2f02481eaf47165d717c193 100644
--- a/src/pkg/websocket/hixie.go
+++ b/src/pkg/websocket/hixie.go
@@ -13,13 +13,13 @@ 	"bytes"
 	"crypto/md5"
 	"encoding/binary"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
-	"rand"
+	"math/rand"
+	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
-	"url"
 )
 
 // An aray of characters to be randomly inserted to construct Sec-WebSocket-Key
diff --git a/src/pkg/websocket/hixie_test.go b/src/pkg/websocket/hixie_test.go
index 40cb53f4ea54d08a353451854e4c889b621e4156..bf537c01b7371586031869076ca1967091edb635 100644
--- a/src/pkg/websocket/hixie_test.go
+++ b/src/pkg/websocket/hixie_test.go
@@ -8,11 +8,11 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 // Test the getChallengeResponse function with values from section
diff --git a/src/pkg/websocket/hybi.go b/src/pkg/websocket/hybi.go
index d3d4258e9816dea6d9b20721031977cdbcea7dde..b17d9470bbc3b383e2dc556de928799439d84a66 100644
--- a/src/pkg/websocket/hybi.go
+++ b/src/pkg/websocket/hybi.go
@@ -15,11 +15,11 @@ 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/binary"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"net/url"
 	"strings"
-	"url"
 )
 
 const (
diff --git a/src/pkg/websocket/hybi_test.go b/src/pkg/websocket/hybi_test.go
index df0f5552653c7a05d8c2cb717b147c2fd67c82d7..60375ff32ad276c4415fc4b0d67339bee91d0c8e 100644
--- a/src/pkg/websocket/hybi_test.go
+++ b/src/pkg/websocket/hybi_test.go
@@ -8,11 +8,11 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 // Test the getNonceAccept function with values in
diff --git a/src/pkg/websocket/server.go b/src/pkg/websocket/server.go
index 8f16517c03e7a30f4c0b93858dfe82ba74e896db..57dc4fd1dfff4d6e1ec6fb0441441e02ef6149ed 100644
--- a/src/pkg/websocket/server.go
+++ b/src/pkg/websocket/server.go
@@ -7,8 +7,8 @@
 import (
 	"bufio"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
 )
 
 func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request) (conn *Conn, err error) {
diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go
index 9732ae11735597fcca51417fcbaa47c35b61c779..1e4036ce391d101f6363ebb878fd992a23b7a000 100644
--- a/src/pkg/websocket/websocket.go
+++ b/src/pkg/websocket/websocket.go
@@ -9,14 +9,14 @@
 import (
 	"bufio"
 	"crypto/tls"
-	"http"
+	"encoding/json"
 	"io"
 	"io/ioutil"
-	"json"
 	"net"
+	"net/http"
+	"net/url"
 	"os"
 	"sync"
-	"url"
 )
 
 const (
diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go
index 25fe2646730bc8c78c33e445c2e030940ffad795..f41c355fac262b7659efe007453bfa3dec1361c6 100644
--- a/src/pkg/websocket/websocket_test.go
+++ b/src/pkg/websocket/websocket_test.go
@@ -7,15 +7,15 @@
 import (
 	"bytes"
 	"fmt"
-	"http"
-	"http/httptest"
 	"io"
 	"log"
 	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
 	"strings"
 	"sync"
 	"testing"
-	"url"
 )
 
 var serverAddr string