diff --git a/go/loader/doc.go b/go/loader/doc.go
index 9b51c9ec..c5aa31c1 100644
--- a/go/loader/doc.go
+++ b/go/loader/doc.go
@@ -7,7 +7,8 @@
 // of dependencies.  The ASTs and the derived facts are retained for
 // later use.
 //
-// THIS INTERFACE IS EXPERIMENTAL AND IS LIKELY TO CHANGE.
+// Deprecated: This is an older API and does not have support
+// for modules. Use golang.org/x/tools/go/packages instead.
 //
 // The package defines two primary types: Config, which specifies a
 // set of initial packages to load and various other options; and
@@ -201,5 +202,3 @@ package loader
 // the error.
 //
 // The result of using concurrency is about a 2.5x speedup for stdlib_test.
-
-// TODO(adonovan): overhaul the package documentation.
diff --git a/go/ssa/ssautil/load.go b/go/ssa/ssautil/load.go
index 72710bec..659d19fd 100644
--- a/go/ssa/ssautil/load.go
+++ b/go/ssa/ssautil/load.go
@@ -101,7 +101,7 @@ func doPackages(initial []*packages.Package, mode ssa.BuilderMode, deps bool) (*
 //
 // The mode parameter controls diagnostics and checking during SSA construction.
 //
-// Deprecated: use golang.org/x/tools/go/packages and the Packages
+// Deprecated: Use golang.org/x/tools/go/packages and the Packages
 // function instead; see ssa.ExampleLoadPackages.
 //
 func CreateProgram(lprog *loader.Program, mode ssa.BuilderMode) *ssa.Program {
diff --git a/go/ssa/testmain.go b/go/ssa/testmain.go
index 8ec15ba5..4bf8d98f 100644
--- a/go/ssa/testmain.go
+++ b/go/ssa/testmain.go
@@ -27,7 +27,8 @@ import (
 // (as defined by "go test") defined in the specified package,
 // and its TestMain function, if any.
 //
-// Deprecated: use x/tools/go/packages to access synthetic testmain packages.
+// Deprecated: Use golang.org/x/tools/go/packages to access synthetic
+// testmain packages.
 func FindTests(pkg *Package) (tests, benchmarks, examples []*Function, main *Function) {
 	prog := pkg.Prog
 
@@ -112,7 +113,8 @@ func isTest(name, prefix string) bool {
 // Subsequent calls to prog.AllPackages include the new package.
 // The package pkg must belong to the program prog.
 //
-// Deprecated: use x/tools/go/packages to access synthetic testmain packages.
+// Deprecated: Use golang.org/x/tools/go/packages to access synthetic
+// testmain packages.
 func (prog *Program) CreateTestMainPackage(pkg *Package) *Package {
 	if pkg.Prog != prog {
 		log.Fatal("Package does not belong to Program")