Also, fix package name in error messages. Fixes #2453 R=rsc CC=golang-dev https://golang.org/cl/5483088
Attach a file by drag & drop or click to upload
