diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 936f9e55115fe6..e9c91477c62775 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -425,7 +425,7 @@ func (w *Walker) Import(name string) (*types.Package, error) {
 	w.imported[name] = &importing
 
 	root := w.root
-	if strings.HasPrefix(name, "golang_org/x/") {
+	if strings.HasPrefix(name, "golang.org/x/") {
 		root = filepath.Join(root, "vendor")
 	}
 
diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
index beb0f1926d8994..89979ab6705676 100644
--- a/src/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
@@ -15,7 +15,7 @@ import (
 	"crypto/x509"
 	"hash"
 
-	"golang_org/x/crypto/chacha20poly1305"
+	"golang.org/x/crypto/chacha20poly1305"
 )
 
 // a keyAgreement implements the client and server side of a TLS key agreement
diff --git a/src/crypto/tls/key_agreement.go b/src/crypto/tls/key_agreement.go
index 1b27c049ed3d56..ba41749af7959b 100644
--- a/src/crypto/tls/key_agreement.go
+++ b/src/crypto/tls/key_agreement.go
@@ -17,7 +17,7 @@ import (
 	"io"
 	"math/big"
 
-	"golang_org/x/crypto/curve25519"
+	"golang.org/x/crypto/curve25519"
 )
 
 var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message")
diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go
index 979f76c1773571..a0cac34b400a3e 100644
--- a/src/go/build/build_test.go
+++ b/src/go/build/build_test.go
@@ -340,11 +340,11 @@ func TestImportVendor(t *testing.T) {
 	testenv.MustHaveGoBuild(t) // really must just have source
 	ctxt := Default
 	ctxt.GOPATH = ""
-	p, err := ctxt.Import("golang_org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
+	p, err := ctxt.Import("golang.org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
 	if err != nil {
-		t.Fatalf("cannot find vendored golang_org/x/net/http2/hpack from net/http directory: %v", err)
+		t.Fatalf("cannot find vendored golang.org/x/net/http2/hpack from net/http directory: %v", err)
 	}
-	want := "vendor/golang_org/x/net/http2/hpack"
+	want := "vendor/golang.org/x/net/http2/hpack"
 	if p.ImportPath != want {
 		t.Fatalf("Import succeeded but found %q, want %q", p.ImportPath, want)
 	}
@@ -370,7 +370,7 @@ func TestImportVendorParentFailure(t *testing.T) {
 	ctxt := Default
 	ctxt.GOPATH = ""
 	// This import should fail because the vendor/golang.org/x/net/http2 directory has no source code.
-	p, err := ctxt.Import("golang_org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
+	p, err := ctxt.Import("golang.org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
 	if err == nil {
 		t.Fatalf("found empty parent in %s", p.Dir)
 	}
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index ec8dd0678811fa..dba27a9f9bd560 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -307,7 +307,7 @@ var pkgDeps = map[string][]string{
 		"context", "math/rand", "os", "reflect", "sort", "syscall", "time",
 		"internal/nettrace", "internal/poll",
 		"internal/syscall/windows", "internal/singleflight", "internal/race",
-		"golang_org/x/net/lif", "golang_org/x/net/route",
+		"golang.org/x/net/lif", "golang.org/x/net/route",
 	},
 
 	// NET enables use of basic network-related packages.
@@ -342,9 +342,9 @@ var pkgDeps = map[string][]string{
 		"crypto/sha1",
 		"crypto/sha256",
 		"crypto/sha512",
-		"golang_org/x/crypto/chacha20poly1305",
-		"golang_org/x/crypto/curve25519",
-		"golang_org/x/crypto/poly1305",
+		"golang.org/x/crypto/chacha20poly1305",
+		"golang.org/x/crypto/curve25519",
+		"golang.org/x/crypto/poly1305",
 	},
 
 	// Random byte, number generation.
@@ -393,12 +393,12 @@ var pkgDeps = map[string][]string{
 		"context",
 		"crypto/rand",
 		"crypto/tls",
-		"golang_org/x/net/http2/hpack",
-		"golang_org/x/net/idna",
-		"golang_org/x/net/lex/httplex",
-		"golang_org/x/net/proxy",
-		"golang_org/x/text/unicode/norm",
-		"golang_org/x/text/width",
+		"golang.org/x/net/http2/hpack",
+		"golang.org/x/net/idna",
+		"golang.org/x/net/lex/httplex",
+		"golang.org/x/net/proxy",
+		"golang.org/x/text/unicode/norm",
+		"golang.org/x/text/width",
 		"internal/nettrace",
 		"mime/multipart",
 		"net/http/httptrace",
@@ -465,7 +465,7 @@ func listStdPkgs(goroot string) ([]string, error) {
 		}
 
 		name := filepath.ToSlash(path[len(src):])
-		if name == "builtin" || name == "cmd" || strings.Contains(name, "golang_org") {
+		if name == "builtin" || name == "cmd" || strings.Contains(name, "golang.org") {
 			return filepath.SkipDir
 		}
 
diff --git a/src/go/internal/srcimporter/srcimporter_test.go b/src/go/internal/srcimporter/srcimporter_test.go
index 79921b5e7855bd..8880475bc031d8 100644
--- a/src/go/internal/srcimporter/srcimporter_test.go
+++ b/src/go/internal/srcimporter/srcimporter_test.go
@@ -98,7 +98,7 @@ var importedObjectTests = []struct {
 	{"math.Pi", "const Pi untyped float"},
 	{"math.Sin", "func Sin(x float64) float64"},
 	{"math/big.Int", "type Int struct{neg bool; abs nat}"},
-	{"golang_org/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
+	{"golang.org/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
 }
 
 func TestImportedTypes(t *testing.T) {
diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index a89f9e87367c18..1283b3e788ff77 100644
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -43,9 +43,9 @@ import (
 	"sync"
 	"time"
 
-	"golang_org/x/net/http2/hpack"
-	"golang_org/x/net/idna"
-	"golang_org/x/net/lex/httplex"
+	"golang.org/x/net/http2/hpack"
+	"golang.org/x/net/idna"
+	"golang.org/x/net/lex/httplex"
 )
 
 const (
diff --git a/src/net/http/http.go b/src/net/http/http.go
index b95ca89f4094c5..0e77b335fec545 100644
--- a/src/net/http/http.go
+++ b/src/net/http/http.go
@@ -11,7 +11,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"golang_org/x/net/lex/httplex"
+	"golang.org/x/net/lex/httplex"
 )
 
 // maxInt64 is the effective "infinite" value for the Server and
diff --git a/src/net/http/request.go b/src/net/http/request.go
index 739970b28cb368..e709c9dc1fec6e 100644
--- a/src/net/http/request.go
+++ b/src/net/http/request.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"golang_org/x/net/idna"
+	"golang.org/x/net/idna"
 )
 
 const (
diff --git a/src/net/http/server.go b/src/net/http/server.go
index 71f46a74f97720..f5b95d744470e0 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang_org/x/net/lex/httplex"
+	"golang.org/x/net/lex/httplex"
 )
 
 // Errors used by the HTTP server.
diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go
index 2a021154c95e19..347dfb104280c5 100644
--- a/src/net/http/transfer.go
+++ b/src/net/http/transfer.go
@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"golang_org/x/net/lex/httplex"
+	"golang.org/x/net/lex/httplex"
 )
 
 // ErrLineTooLong is returned when reading request or response bodies
diff --git a/src/net/http/transport.go b/src/net/http/transport.go
index 425db360182280..e15082dd8c0273 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -28,8 +28,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang_org/x/net/lex/httplex"
-	"golang_org/x/net/proxy"
+	"golang.org/x/net/lex/httplex"
+	"golang.org/x/net/proxy"
 )
 
 // DefaultTransport is the default implementation of Transport and is
diff --git a/src/net/interface_bsd.go b/src/net/interface_bsd.go
index 35b1c2681592ae..d791cb30167943 100644
--- a/src/net/interface_bsd.go
+++ b/src/net/interface_bsd.go
@@ -9,7 +9,7 @@ package net
 import (
 	"syscall"
 
-	"golang_org/x/net/route"
+	"golang.org/x/net/route"
 )
 
 // If the ifindex is zero, interfaceTable returns mappings of all
diff --git a/src/net/interface_bsdvar.go b/src/net/interface_bsdvar.go
index 0b84ca37d4a447..a809b5f5ce49e6 100644
--- a/src/net/interface_bsdvar.go
+++ b/src/net/interface_bsdvar.go
@@ -9,7 +9,7 @@ package net
 import (
 	"syscall"
 
-	"golang_org/x/net/route"
+	"golang.org/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
diff --git a/src/net/interface_darwin.go b/src/net/interface_darwin.go
index 2ec8e1cc6ef70f..bb4fd73a987670 100644
--- a/src/net/interface_darwin.go
+++ b/src/net/interface_darwin.go
@@ -7,7 +7,7 @@ package net
 import (
 	"syscall"
 
-	"golang_org/x/net/route"
+	"golang.org/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
diff --git a/src/net/interface_freebsd.go b/src/net/interface_freebsd.go
index 8a7d6f67c039d4..45badd64954a17 100644
--- a/src/net/interface_freebsd.go
+++ b/src/net/interface_freebsd.go
@@ -7,7 +7,7 @@ package net
 import (
 	"syscall"
 
-	"golang_org/x/net/route"
+	"golang.org/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
diff --git a/src/net/interface_solaris.go b/src/net/interface_solaris.go
index dc8ffbfcb8a643..5f9367f996ff64 100644
--- a/src/net/interface_solaris.go
+++ b/src/net/interface_solaris.go
@@ -7,7 +7,7 @@ package net
 import (
 	"syscall"
 
-	"golang_org/x/net/lif"
+	"golang.org/x/net/lif"
 )
 
 // If the ifindex is zero, interfaceTable returns mappings of all