Two forgotten renames from last CL. TBR=r CC=golang-dev https://golang.org/cl/5502046
Attach a file by drag & drop or click to upload
