diff --git a/README b/README
index 916ae2e6ca..d5944c6db0 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ This subrepository holds the source for various packages and tools that support
 the Go programming language.
 
 Some of the tools, godoc and vet for example, are included in binary Go distributions.
-Others, including the Go oracle and the test coverage tool, can be fetched with "go get".
+Others, including the Go guru and the test coverage tool, can be fetched with "go get".
 
 Packages include a type-checker for Go and an implementation of the
 Static Single Assignment form (SSA) representation for Go programs.
diff --git a/go/buildutil/util.go b/go/buildutil/util.go
index eefe1f2fc5..6dc0cfb868 100644
--- a/go/buildutil/util.go
+++ b/go/buildutil/util.go
@@ -53,8 +53,6 @@ func ParseFile(fset *token.FileSet, ctxt *build.Context, displayPath func(string
 // The '...Files []string' fields of the resulting build.Package are not
 // populated (build.FindOnly mode).
 //
-// TODO(adonovan): call this from oracle when the tree thaws.
-//
 func ContainingPackage(ctxt *build.Context, dir, filename string) (*build.Package, error) {
 	if !IsAbsPath(ctxt, filename) {
 		filename = JoinPath(ctxt, dir, filename)
diff --git a/go/loader/cgo.go b/go/loader/cgo.go
index 245b914914..c735d11225 100644
--- a/go/loader/cgo.go
+++ b/go/loader/cgo.go
@@ -39,7 +39,7 @@ package loader
 // The benefit of this approach would have been that source-level
 // syntax information would correspond exactly to the original cgo
 // file, with no preprocessing involved, making source tools like
-// godoc, oracle, and eg happy.  However, the approach was rejected
+// godoc, guru, and eg happy.  However, the approach was rejected
 // due to the additional complexity it would impose on go/types.  (It
 // made for a beautiful demo, though.)
 //
diff --git a/go/pointer/hvn.go b/go/pointer/hvn.go
index e550bc9cee..0a5aaa33c3 100644
--- a/go/pointer/hvn.go
+++ b/go/pointer/hvn.go
@@ -76,7 +76,7 @@ package pointer
 //
 // PERFORMANCE
 //
-// In two benchmarks (oracle and godoc), HVN eliminates about two thirds
+// In two benchmarks (guru and godoc), HVN eliminates about two thirds
 // of nodes, the majority accounted for by non-pointers: nodes of
 // non-pointer type, pointers that remain nil, formal parameters of dead
 // functions, nodes of untracked types, etc.  It also reduces the number
diff --git a/go/pointer/testdata/rtti.go b/go/pointer/testdata/rtti.go
index 826936de77..88e1798d00 100644
--- a/go/pointer/testdata/rtti.go
+++ b/go/pointer/testdata/rtti.go
@@ -1,6 +1,6 @@
 package main
 
-// Regression test for oracle crash
+// Regression test for guru crash
 // https://code.google.com/p/go/issues/detail?id=6605
 //
 // Using reflection, methods may be called on types that are not the
diff --git a/godoc/analysis/README b/godoc/analysis/README
index 411af1cbaf..5b29a3260b 100644
--- a/godoc/analysis/README
+++ b/godoc/analysis/README
@@ -90,7 +90,7 @@ syntactic constructs that can instantiate it:
     etc
     + all INSTANTIATIONS of all S defined as struct{t T} or [n]T
 (Potentially a lot of information.)
-(Add this to oracle too.)
+(Add this to guru too.)
 
 
 Optimisations
diff --git a/godoc/analysis/peers.go b/godoc/analysis/peers.go
index 74a08a1fee..5b3445362b 100644
--- a/godoc/analysis/peers.go
+++ b/godoc/analysis/peers.go
@@ -115,7 +115,7 @@ func (a *analysis) doChannelPeers(ptsets map[ssa.Value]pointer.Pointer) {
 // -- utilities --------------------------------------------------------
 
 // chanOp abstracts an ssa.Send, ssa.Unop(ARROW), close(), or a SelectState.
-// Derived from oracle/peers.go.
+// Derived from cmd/guru/peers.go.
 type chanOp struct {
 	ch   ssa.Value
 	mode string // sent|received|closed
@@ -125,7 +125,7 @@ type chanOp struct {
 }
 
 // chanOps returns a slice of all the channel operations in the instruction.
-// Derived from oracle/peers.go.
+// Derived from cmd/guru/peers.go.
 func chanOps(instr ssa.Instruction) []chanOp {
 	fn := instr.Parent()
 	var ops []chanOp
diff --git a/refactor/rename/util.go b/refactor/rename/util.go
index e90b7042eb..bcf684d74a 100644
--- a/refactor/rename/util.go
+++ b/refactor/rename/util.go
@@ -81,7 +81,7 @@ func isDigit(ch rune) bool {
 	return '0' <= ch && ch <= '9' || ch >= 0x80 && unicode.IsDigit(ch)
 }
 
-// -- Plundered from golang.org/x/tools/oracle -----------------
+// -- Plundered from golang.org/x/tools/cmd/guru -----------------
 
 // sameFile returns true if x and y have the same basename and denote
 // the same file.