diff --git a/cmd/hiveview/deploy.go b/cmd/hiveview/deploy.go
index a811e284cb..fd5048403f 100644
--- a/cmd/hiveview/deploy.go
+++ b/cmd/hiveview/deploy.go
@@ -215,7 +215,7 @@ func insertAfterTag(r io.Reader, w io.Writer, tagName, content string) error {
 	}
 }
 
-// modifyScripts changes the 'src' URL of all script tags using the given function.
+// modifyHTML changes the 'src' URL of all html tags using the given function.
 func modifyHTML(r io.Reader, w io.Writer, modify func(tag *html.Token, errlog io.Writer)) error {
 	var errlog bytes.Buffer
 	z := html.NewTokenizer(r)
diff --git a/hivesim/hive.go b/hivesim/hive.go
index f7a36005fc..132376a9fb 100644
--- a/hivesim/hive.go
+++ b/hivesim/hive.go
@@ -254,7 +254,7 @@ func (sim *Simulation) ClientEnodeURL(testSuite SuiteID, test TestID, node strin
 	return sim.ClientEnodeURLNetwork(testSuite, test, node, "bridge")
 }
 
-// ClientEnodeURLCustomNetwork returns the enode URL of a running client in a custom network.
+// ClientEnodeURLNetwork returns the enode URL of a running client in a custom network.
 func (sim *Simulation) ClientEnodeURLNetwork(testSuite SuiteID, test TestID, node string, network string) (string, error) {
 	if sim.docs != nil {
 		return "", errors.New("ClientEnodeURLNetwork is not supported in docs mode")
diff --git a/hivesim/testapi.go b/hivesim/testapi.go
index 8fa0dda97c..b1479652b5 100644
--- a/hivesim/testapi.go
+++ b/hivesim/testapi.go
@@ -171,7 +171,7 @@ func (c *Client) EnodeURL() (string, error) {
 	return c.test.Sim.ClientEnodeURL(c.test.SuiteID, c.test.TestID, c.Container)
 }
 
-// EnodeURL returns the peer-to-peer endpoint of the client on a specific network.
+// EnodeURLNetwork returns the peer-to-peer endpoint of the client on a specific network.
 func (c *Client) EnodeURLNetwork(network string) (string, error) {
 	return c.test.Sim.ClientEnodeURLNetwork(c.test.SuiteID, c.test.TestID, c.Container, network)
 }