diff --git a/cmd/callgraph/main_test.go b/cmd/callgraph/main_test.go
index 93ccb618..81fa490c 100644
--- a/cmd/callgraph/main_test.go
+++ b/cmd/callgraph/main_test.go
@@ -40,13 +40,13 @@ func TestCallgraph(t *testing.T) {
 		// tests: main is not called.
 		{"rta", format, true, []string{
 			`pkg.Example --> (pkg.C).f`,
-			`testmain.init --> pkg.init`,
+			`test$main.init --> pkg.init`,
 		}},
 		{"pta", format, true, []string{
 			`<root> --> pkg.Example`,
-			`<root> --> testmain.init`,
+			`<root> --> test$main.init`,
 			`pkg.Example --> (pkg.C).f`,
-			`testmain.init --> pkg.init`,
+			`test$main.init --> pkg.init`,
 		}},
 	} {
 		stdout = new(bytes.Buffer)
diff --git a/go/ssa/func.go b/go/ssa/func.go
index 3f08d3e1..621ec1d0 100644
--- a/go/ssa/func.go
+++ b/go/ssa/func.go
@@ -426,7 +426,7 @@ func (f *Function) lookup(obj types.Object, escaping bool) Value {
 	// Definition must be in an enclosing function;
 	// plumb it through intervening closures.
 	if f.parent == nil {
-		panic("no Value for type.Object " + obj.Name())
+		panic("no ssa.Value for " + obj.String())
 	}
 	outer := f.parent.lookup(obj, true) // escaping
 	v := &FreeVar{
diff --git a/go/ssa/testmain.go b/go/ssa/testmain.go
index ae9ec1c9..a525c0b1 100644
--- a/go/ssa/testmain.go
+++ b/go/ssa/testmain.go
@@ -100,7 +100,7 @@ func (prog *Program) CreateTestMainPackage(pkgs ...*Package) *Package {
 		Prog:    prog,
 		Members: make(map[string]Member),
 		values:  make(map[types.Object]Value),
-		Object:  types.NewPackage("testmain", "testmain"),
+		Object:  types.NewPackage("test$main", "main"),
 	}
 
 	// Build package's init function.
diff --git a/refactor/importgraph/graph.go b/refactor/importgraph/graph.go
index 6f49fabc..df73e237 100644
--- a/refactor/importgraph/graph.go
+++ b/refactor/importgraph/graph.go
@@ -51,7 +51,7 @@ func (g Graph) Search(roots ...string) map[string]bool {
 	return seen
 }
 
-// Builds scans the specified Go workspace and builds the forward and
+// Build scans the specified Go workspace and builds the forward and
 // reverse import dependency graphs for all its packages.
 // It also returns a mapping from import paths to errors for packages
 // that could not be loaded.