diff --git a/apiserver/pkg/manager/resource_manager.go b/apiserver/pkg/manager/resource_manager.go
index 8ee0c6436e..8d15dcafbd 100644
--- a/apiserver/pkg/manager/resource_manager.go
+++ b/apiserver/pkg/manager/resource_manager.go
@@ -211,7 +211,7 @@ func (r *ResourceManager) ListComputeTemplates(ctx context.Context, namespace st
 	client := r.getKubernetesConfigMapClient(namespace)
 	configMapList, err := client.List(ctx, metav1.ListOptions{LabelSelector: "ray.io/config-type=compute-template"})
 	if err != nil {
-		return nil, util.Wrap(err, "List compute runtimes failed")
+		return nil, util.Wrap(err, "List compute templates failed")
 	}
 
 	var result []*v1.ConfigMap
@@ -282,7 +282,7 @@ func getComputeTemplateByName(ctx context.Context, client clientv1.ConfigMapInte
 	runtime, err := client.Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
 		if errors.IsNotFound(err) {
-			return nil, util.NewNotFoundError(err, "Cluster %s not found", name)
+			return nil, util.NewNotFoundError(err, "Compute template %s not found", name)
 		}
 
 		return nil, util.Wrap(err, "Get compute template failed")
diff --git a/docs/design/protobuf-grpc-service.md b/docs/design/protobuf-grpc-service.md
index 193a37516a..3d1e8ca108 100644
--- a/docs/design/protobuf-grpc-service.md
+++ b/docs/design/protobuf-grpc-service.md
@@ -215,7 +215,7 @@ service ComputeTemplateService {
     };
   }
 
-  // Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
+  // Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.
   rpc ListAllComputeTemplates(ListAllComputeTemplatesRequest) returns (ListAllComputeTemplatesResponse) {
     option (google.api.http) = {
       get: "/apis/v1alpha2/compute_templates"
diff --git a/proto/config.proto b/proto/config.proto
index 5c1e1723c8..6edeb2c74c 100644
--- a/proto/config.proto
+++ b/proto/config.proto
@@ -45,7 +45,7 @@ service ComputeTemplateService {
     };
   }
 
-  // Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
+  // Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.
   rpc ListAllComputeTemplates(ListAllComputeTemplatesRequest) returns (ListAllComputeTemplatesResponse) {
     option (google.api.http) = {
       get: "/apis/v1alpha2/compute_templates"
diff --git a/proto/go_client/config_grpc.pb.go b/proto/go_client/config_grpc.pb.go
index 3beea0d68d..36e12123be 100644
--- a/proto/go_client/config_grpc.pb.go
+++ b/proto/go_client/config_grpc.pb.go
@@ -25,7 +25,7 @@ type ComputeTemplateServiceClient interface {
 	GetComputeTemplate(ctx context.Context, in *GetComputeTemplateRequest, opts ...grpc.CallOption) (*ComputeTemplate, error)
 	// Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
 	ListComputeTemplates(ctx context.Context, in *ListComputeTemplatesRequest, opts ...grpc.CallOption) (*ListComputeTemplatesResponse, error)
-	// Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
+	// Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.
 	ListAllComputeTemplates(ctx context.Context, in *ListAllComputeTemplatesRequest, opts ...grpc.CallOption) (*ListAllComputeTemplatesResponse, error)
 	// Deletes a compute template by its name and namespace
 	DeleteComputeTemplate(ctx context.Context, in *DeleteComputeTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
@@ -94,7 +94,7 @@ type ComputeTemplateServiceServer interface {
 	GetComputeTemplate(context.Context, *GetComputeTemplateRequest) (*ComputeTemplate, error)
 	// Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
 	ListComputeTemplates(context.Context, *ListComputeTemplatesRequest) (*ListComputeTemplatesResponse, error)
-	// Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.
+	// Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.
 	ListAllComputeTemplates(context.Context, *ListAllComputeTemplatesRequest) (*ListAllComputeTemplatesResponse, error)
 	// Deletes a compute template by its name and namespace
 	DeleteComputeTemplate(context.Context, *DeleteComputeTemplateRequest) (*emptypb.Empty, error)
diff --git a/proto/swagger/config.swagger.json b/proto/swagger/config.swagger.json
index c331a2fd97..ce2ce8d8e5 100644
--- a/proto/swagger/config.swagger.json
+++ b/proto/swagger/config.swagger.json
@@ -24,7 +24,7 @@
   "paths": {
     "/apis/v1alpha2/compute_templates": {
       "get": {
-        "summary": "Finds all compute templates in a given namespace. Supports pagination, and sorting on certain fields.",
+        "summary": "Finds all compute templates in all namespaces. Supports pagination, and sorting on certain fields.",
         "operationId": "ComputeTemplateService_ListAllComputeTemplates",
         "responses": {
           "200": {