diff --git a/client.go b/client.go
index 3c9ff0709..185b09f93 100644
--- a/client.go
+++ b/client.go
@@ -61,11 +61,11 @@ func NewInternalHTTPClient(host string, options *ClientOptions) (*InternalHTTPCl
 		return nil, err
 	}
 
-	client := NewClientFromURI(uri, options)
+	client := NewInternalHTTPClientFromURI(uri, options)
 	return client, nil
 }
 
-func NewClientFromURI(defaultURI *URI, options *ClientOptions) *InternalHTTPClient {
+func NewInternalHTTPClientFromURI(defaultURI *URI, options *ClientOptions) *InternalHTTPClient {
 	if options == nil {
 		options = &ClientOptions{}
 	}
diff --git a/executor.go b/executor.go
index 6cb4aad0d..2f5acf3c0 100644
--- a/executor.go
+++ b/executor.go
@@ -56,7 +56,7 @@ func NewExecutor(clientOptions *ClientOptions) *Executor {
 		clientOptions = &ClientOptions{}
 	}
 	return &Executor{
-		client: NewClientFromURI(nil, clientOptions),
+		client: NewInternalHTTPClientFromURI(nil, clientOptions),
 	}
 }
 
diff --git a/handler.go b/handler.go
index 811ab14f1..0f224c31d 100644
--- a/handler.go
+++ b/handler.go
@@ -1506,7 +1506,7 @@ func (h *Handler) handlePostFrameRestore(w http.ResponseWriter, r *http.Request)
 	}
 
 	// Create a client for the remote cluster.
-	client := NewClientFromURI(host, h.ClientOptions)
+	client := NewInternalHTTPClientFromURI(host, h.ClientOptions)
 
 	// Determine the maximum number of slices.
 	maxSlices, err := client.MaxSliceByIndex(r.Context())
diff --git a/server.go b/server.go
index 7c255079e..3460bec46 100644
--- a/server.go
+++ b/server.go
@@ -537,7 +537,7 @@ func (s *Server) createDefaultClient() {
 	if s.TLS != nil {
 		transport.TLSClientConfig = s.TLS
 	}
-	s.defaultClient = NewClientFromURI(nil, &ClientOptions{TLS: s.TLS})
+	s.defaultClient = NewInternalHTTPClientFromURI(nil, &ClientOptions{TLS: s.TLS})
 }
 
 // CountOpenFiles on opperating systems that support lsof