add some better godoc names