diff --git a/conf/lex.go b/conf/lex.go
index 63befc69fa..caee90782a 100644
--- a/conf/lex.go
+++ b/conf/lex.go
@@ -681,7 +681,7 @@ func lexMapQuotedKey(lx *lexer) stateFn {
 	return lexMapQuotedKey
 }
 
-// lexMapQuotedKey consumes the text of a key between quotes.
+// lexMapDubQuotedKey consumes the text of a key between quotes.
 func lexMapDubQuotedKey(lx *lexer) stateFn {
 	if r := lx.peek(); r == eof {
 		return lx.errorf("Unexpected EOF processing double quoted map key.")
@@ -1061,7 +1061,7 @@ func lexNegNumberStart(lx *lexer) stateFn {
 	return lexNegNumber
 }
 
-// lexNumber consumes a negative integer or a float after seeing the first digit.
+// lexNegNumber consumes a negative integer or a float after seeing the first digit.
 func lexNegNumber(lx *lexer) stateFn {
 	r := lx.next()
 	switch {
diff --git a/server/accounts.go b/server/accounts.go
index fa22466258..7f397bc7cb 100644
--- a/server/accounts.go
+++ b/server/accounts.go
@@ -1342,7 +1342,7 @@ func (a *Account) sendBackendErrorTrackingLatency(si *serviceImport, reason rsiR
 	a.sendLatencyResult(si, sl)
 }
 
-// sendTrackingMessage will send out the appropriate tracking information for the
+// sendTrackingLatency will send out the appropriate tracking information for the
 // service request/response latency. This is called when the requestor's server has
 // received the response.
 // TODO(dlc) - holding locks for RTTs may be too much long term. Should revisit.
@@ -1602,7 +1602,7 @@ func (a *Account) NumPendingAllResponses() int {
 	return a.NumPendingResponses(_EMPTY_)
 }
 
-// NumResponsesPending returns the number of responses outstanding for service exports
+// NumPendingResponses returns the number of responses outstanding for service exports
 // on this account. An empty filter string returns all responses regardless of which export.
 // If you specify the filter we will only return ones that are for that export.
 // NOTE this is only for what this server is tracking.
diff --git a/server/jetstream.go b/server/jetstream.go
index 89313447a3..fd76e36e92 100644
--- a/server/jetstream.go
+++ b/server/jetstream.go
@@ -464,7 +464,7 @@ func (s *Server) restartJetStream() error {
 	return nil
 }
 
-// checkStreamExports will check if we have the JS exports setup
+// checkJetStreamExports will check if we have the JS exports setup
 // on the system account, and if not go ahead and set them up.
 func (s *Server) checkJetStreamExports() {
 	if sacc := s.SystemAccount(); sacc != nil {
@@ -638,7 +638,7 @@ func (a *Account) enableAllJetStreamServiceImportsAndMappings() error {
 	return nil
 }
 
-// enableJetStreamEnabledServiceImportOnly will enable the single service import responder.
+// enableJetStreamInfoServiceImportOnly will enable the single service import responder.
 // Should we do them all regardless?
 func (a *Account) enableJetStreamInfoServiceImportOnly() error {
 	// Check if this import would be overshadowed. This can happen when accounts