diff --git a/lib/godoc/package.html b/lib/godoc/package.html
index d0a42b47baa..7073d72baa1 100644
--- a/lib/godoc/package.html
+++ b/lib/godoc/package.html
@@ -44,7 +44,7 @@
 {{end}}
 {{with .PDoc}}
 	<h2 id="Overview">Overview</h2>
-	<!-- PackageName is printed as title by the top-level template -->
+	<!-- The package's Name is printed as title by the top-level template -->
 	{{if $.IsPkg}}
 		<p><code>import "{{html .ImportPath}}"</code></p>
 	{{end}}
diff --git a/lib/godoc/package.txt b/lib/godoc/package.txt
index f219ecee96e..d88cda79fed 100644
--- a/lib/godoc/package.txt
+++ b/lib/godoc/package.txt
@@ -4,7 +4,7 @@
 
 */}}{{with .PDoc}}{{if $.IsPkg}}PACKAGE
 
-package {{.PackageName}}
+package {{.Name}}
     import "{{.ImportPath}}"
 
 {{else}}COMMAND DOCUMENTATION