diff --git a/app/doc.go b/app/doc.go
index 02bd6db..2fabcd9 100644
--- a/app/doc.go
+++ b/app/doc.go
@@ -85,4 +85,4 @@ response to lifecycle events. Such packages should call:
 
 in an init function inside that package.
 */
-package app // import "golang.org/x/mobile/app"
+package app
diff --git a/asset/doc.go b/asset/doc.go
index b40d4a4..37bb9bb 100644
--- a/asset/doc.go
+++ b/asset/doc.go
@@ -14,4 +14,4 @@
 //
 // For consistency when debugging on a desktop, assets are read from a
 // directory named assets under the current working directory.
-package asset // import "golang.org/x/mobile/asset"
+package asset
diff --git a/bind/bind.go b/bind/bind.go
index e569083..7c1b22e 100644
--- a/bind/bind.go
+++ b/bind/bind.go
@@ -7,7 +7,7 @@
 // See the documentation on the gobind command for usage details
 // and the list of currently supported types.
 // (http://godoc.org/golang.org/x/mobile/cmd/gobind)
-package bind // import "golang.org/x/mobile/bind"
+package bind
 
 // TODO(crawshaw): slice support
 // TODO(crawshaw): channel support
diff --git a/bind/java/context_android.go b/bind/java/context_android.go
index dc44431..ee77a7e 100644
--- a/bind/java/context_android.go
+++ b/bind/java/context_android.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package java // import "golang.org/x/mobile/bind/java"
+package java
 
 // #cgo LDFLAGS: -llog
 //
diff --git a/bind/seq/seq.go b/bind/seq/seq.go
index 0740ca8..6992636 100644
--- a/bind/seq/seq.go
+++ b/bind/seq/seq.go
@@ -9,7 +9,7 @@
 //
 // Designed only for use by the code generated by gobind. Don't try to
 // use this directly.
-package seq // import "golang.org/x/mobile/bind/seq"
+package seq
 
 import _ "golang.org/x/mobile/internal/mobileinit"
 
diff --git a/cmd/gobind/doc.go b/cmd/gobind/doc.go
index cffb0d8..07b9df6 100644
--- a/cmd/gobind/doc.go
+++ b/cmd/gobind/doc.go
@@ -249,4 +249,4 @@ Examples can be found in http://golang.org/x/mobile/example.
 
 Design doc: http://golang.org/s/gobind
 */
-package main // import "golang.org/x/mobile/cmd/gobind"
+package main
diff --git a/cmd/gomobile/doc.go b/cmd/gomobile/doc.go
index 205f167..6922125 100644
--- a/cmd/gomobile/doc.go
+++ b/cmd/gomobile/doc.go
@@ -167,4 +167,4 @@ Usage:
 
 Version prints versions of the gomobile binary and tools
 */
-package main // import "golang.org/x/mobile/cmd/gomobile"
+package main
diff --git a/event/lifecycle/lifecycle.go b/event/lifecycle/lifecycle.go
index 4c58858..58de2c4 100644
--- a/event/lifecycle/lifecycle.go
+++ b/event/lifecycle/lifecycle.go
@@ -17,7 +17,7 @@
 // means it has lost the focus.
 //
 // See the golang.org/x/mobile/app package for details on the event model.
-package lifecycle // import "golang.org/x/mobile/event/lifecycle"
+package lifecycle
 
 import (
 	"fmt"
diff --git a/event/mouse/mouse.go b/event/mouse/mouse.go
index eec2fc0..e98131d 100644
--- a/event/mouse/mouse.go
+++ b/event/mouse/mouse.go
@@ -5,7 +5,7 @@
 // Package mouse defines an event for mouse input.
 //
 // See the golang.org/x/mobile/app package for details on the event model.
-package mouse // import "golang.org/x/mobile/event/mouse"
+package mouse
 
 import (
 	"fmt"
diff --git a/event/paint/paint.go b/event/paint/paint.go
index 0f24b1a..179136c 100644
--- a/event/paint/paint.go
+++ b/event/paint/paint.go
@@ -5,7 +5,7 @@
 // Package paint defines an event for the app being ready to paint.
 //
 // See the golang.org/x/mobile/app package for details on the event model.
-package paint // import "golang.org/x/mobile/event/paint"
+package paint
 
 // Event indicates that the app is ready to paint the next frame of the GUI.
 //
diff --git a/event/size/size.go b/event/size/size.go
index f396728..4c4070b 100644
--- a/event/size/size.go
+++ b/event/size/size.go
@@ -6,7 +6,7 @@
 // orientation of the app's window.
 //
 // See the golang.org/x/mobile/app package for details on the event model.
-package size // import "golang.org/x/mobile/event/size"
+package size
 
 import (
 	"image"
diff --git a/event/touch/touch.go b/event/touch/touch.go
index c91967b..94c4853 100644
--- a/event/touch/touch.go
+++ b/event/touch/touch.go
@@ -5,7 +5,7 @@
 // Package touch defines an event for touch input.
 //
 // See the golang.org/x/mobile/app package for details on the event model.
-package touch // import "golang.org/x/mobile/event/touch"
+package touch
 
 // The best source on android input events is the NDK: include/android/input.h
 //
diff --git a/exp/app/debug/fps.go b/exp/app/debug/fps.go
index c015705..67b194f 100644
--- a/exp/app/debug/fps.go
+++ b/exp/app/debug/fps.go
@@ -5,7 +5,7 @@
 //go:build darwin || linux || windows
 
 // Package debug provides GL-based debugging tools for apps.
-package debug // import "golang.org/x/mobile/exp/app/debug"
+package debug
 
 import (
 	"image"
diff --git a/exp/audio/al/al.go b/exp/audio/al/al.go
index 9744889..f27dca2 100644
--- a/exp/audio/al/al.go
+++ b/exp/audio/al/al.go
@@ -22,7 +22,7 @@
 // license file to the open source notices of your application.
 // OpenAL Soft's license file could be found at
 // http://repo.or.cz/w/openal-soft.git/blob/HEAD:/COPYING.
-package al // import "golang.org/x/mobile/exp/audio/al"
+package al
 
 // Capability represents OpenAL extension capabilities.
 type Capability int32
diff --git a/exp/f32/f32.go b/exp/f32/f32.go
index 59e1b65..a0a3ed0 100644
--- a/exp/f32/f32.go
+++ b/exp/f32/f32.go
@@ -23,7 +23,7 @@
 // The interface to this package is not stable. It will change considerably.
 // Only use functions that provide package documentation. Semantics are
 // non-obvious. Be prepared for the package name to change.
-package f32 // import "golang.org/x/mobile/exp/f32"
+package f32
 
 import (
 	"encoding/binary"
diff --git a/exp/font/doc.go b/exp/font/doc.go
index 5ae7205..349feb4 100644
--- a/exp/font/doc.go
+++ b/exp/font/doc.go
@@ -3,4 +3,4 @@
 // license that can be found in the LICENSE file.
 
 // Package font provides platform independent access to system fonts.
-package font // import "golang.org/x/mobile/exp/font"
+package font
diff --git a/exp/gl/glutil/doc.go b/exp/gl/glutil/doc.go
index 44b1210..94e4a6c 100644
--- a/exp/gl/glutil/doc.go
+++ b/exp/gl/glutil/doc.go
@@ -3,4 +3,4 @@
 // license that can be found in the LICENSE file.
 
 // Package glutil implements OpenGL utility functions.
-package glutil // import "golang.org/x/mobile/exp/gl/glutil"
+package glutil
diff --git a/exp/gl/glutil/glutil.go b/exp/gl/glutil/glutil.go
index 880b97e..26edca1 100644
--- a/exp/gl/glutil/glutil.go
+++ b/exp/gl/glutil/glutil.go
@@ -4,7 +4,7 @@
 
 //go:build darwin || linux || windows
 
-package glutil // import "golang.org/x/mobile/exp/gl/glutil"
+package glutil
 
 import (
 	"fmt"
diff --git a/exp/sensor/sensor.go b/exp/sensor/sensor.go
index 2c697b6..d030035 100644
--- a/exp/sensor/sensor.go
+++ b/exp/sensor/sensor.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package sensor provides sensor events from various movement sensors.
-package sensor // import "golang.org/x/mobile/exp/sensor"
+package sensor
 
 import (
 	"errors"
diff --git a/exp/sprite/clock/clock.go b/exp/sprite/clock/clock.go
index a468e66..6d4dbc2 100644
--- a/exp/sprite/clock/clock.go
+++ b/exp/sprite/clock/clock.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package clock provides a clock and time functions for a sprite engine.
-package clock // import "golang.org/x/mobile/exp/sprite/clock"
+package clock
 
 // A Time represents an instant in sprite time.
 //
diff --git a/exp/sprite/glsprite/glsprite.go b/exp/sprite/glsprite/glsprite.go
index 1e9fa0c..32ca899 100644
--- a/exp/sprite/glsprite/glsprite.go
+++ b/exp/sprite/glsprite/glsprite.go
@@ -8,7 +8,7 @@
 //
 // Each sprite.Texture is loaded as a GL texture object and drawn
 // to the screen via an affine transform done in a simple shader.
-package glsprite // import "golang.org/x/mobile/exp/sprite/glsprite"
+package glsprite
 
 import (
 	"image"
diff --git a/exp/sprite/portable/portable.go b/exp/sprite/portable/portable.go
index 4b6c915..bcf0724 100644
--- a/exp/sprite/portable/portable.go
+++ b/exp/sprite/portable/portable.go
@@ -7,7 +7,7 @@
 // It is intended to serve as a reference implementation for testing
 // other sprite Engines written against OpenGL, or other more exotic
 // modern hardware interfaces.
-package portable // import "golang.org/x/mobile/exp/sprite/portable"
+package portable
 
 import (
 	"image"
diff --git a/exp/sprite/sprite.go b/exp/sprite/sprite.go
index df13fb5..cbc9f45 100644
--- a/exp/sprite/sprite.go
+++ b/exp/sprite/sprite.go
@@ -22,7 +22,7 @@
 //		modify the scene's nodes and animations (Arranger values)
 //		e.Render(scene, t, sz)
 //	}
-package sprite // import "golang.org/x/mobile/exp/sprite"
+package sprite
 
 import (
 	"image"
diff --git a/geom/geom.go b/geom/geom.go
index 1bfd14f..6b73944 100644
--- a/geom/geom.go
+++ b/geom/geom.go
@@ -19,7 +19,7 @@ the screen. Positions on the plane are measured in typographic points,
 Any interface that draws to the screen using types from the geom package
 scales the number of pixels to maintain a Pt as 1/72 of an inch.
 */
-package geom // import "golang.org/x/mobile/geom"
+package geom
 
 /*
 Notes on the various underlying coordinate systems.
diff --git a/gl/doc.go b/gl/doc.go
index 4cf9504..408c35a 100644
--- a/gl/doc.go
+++ b/gl/doc.go
@@ -42,7 +42,7 @@ error messages. For example,
 The gldebug tracing has very high overhead, so make sure to remove
 the build tag before deploying any binaries.
 */
-package gl // import "golang.org/x/mobile/gl"
+package gl
 
 /*
 Implementation details.