diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
index c7760e652a244..ad60758919e09 100644
--- a/cmd/argocd/commands/app.go
+++ b/cmd/argocd/commands/app.go
@@ -262,8 +262,8 @@ func NewApplicationSetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com
 			}
 			setParameterOverrides(app, appOpts.parameters)
 			_, err = appIf.UpdateSpec(context.Background(), &application.ApplicationSpecRequest{
-				AppName: &app.Name,
-				Spec:    app.Spec,
+				Name: &app.Name,
+				Spec: app.Spec,
 			})
 			errors.CheckError(err)
 		},
@@ -330,8 +330,8 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
 				return
 			}
 			_, err = appIf.UpdateSpec(context.Background(), &application.ApplicationSpecRequest{
-				AppName: &app.Name,
-				Spec:    app.Spec,
+				Name: &app.Name,
+				Spec: app.Spec,
 			})
 			errors.CheckError(err)
 		},
diff --git a/server/application/application.go b/server/application/application.go
index 2d2eac56b0166..81b0fad0ad477 100644
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -98,8 +98,8 @@ func (s *Server) Create(ctx context.Context, q *ApplicationCreateRequest) (*appv
 }
 
 // GetManifests returns application manifests
-func (s *Server) GetManifests(ctx context.Context, q *ManifestQuery) (*repository.ManifestResponse, error) {
-	app, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(*q.AppName, metav1.GetOptions{})
+func (s *Server) GetManifests(ctx context.Context, q *ApplicationManifestQuery) (*repository.ManifestResponse, error) {
+	app, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(*q.Name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -119,8 +119,8 @@ func (s *Server) GetManifests(ctx context.Context, q *ManifestQuery) (*repositor
 	}
 
 	revision := app.Spec.Source.TargetRevision
-	if q.Revision != nil && *q.Revision != "" {
-		revision = *q.Revision
+	if q.Revision != "" {
+		revision = q.Revision
 	}
 	manifestInfo, err := repoClient.GenerateManifest(context.Background(), &repository.ManifestRequest{
 		Repo:                        repo,
@@ -144,7 +144,7 @@ func (s *Server) Get(ctx context.Context, q *ApplicationQuery) (*appv1.Applicati
 
 // ListResourceEvents returns a list of event resources
 func (s *Server) ListResourceEvents(ctx context.Context, q *ApplicationResourceEventsQuery) (*v1.EventList, error) {
-	config, namespace, err := s.getApplicationClusterConfig(*q.AppName)
+	config, namespace, err := s.getApplicationClusterConfig(*q.Name)
 	if err != nil {
 		return nil, err
 	}
@@ -154,8 +154,8 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *ApplicationResourceE
 	}
 
 	fieldSelector := fields.SelectorFromSet(map[string]string{
-		"involvedObject.name":      *q.ResName,
-		"involvedObject.uid":       *q.ResUid,
+		"involvedObject.name":      q.ResourceName,
+		"involvedObject.uid":       q.ResourceUID,
 		"involvedObject.namespace": namespace,
 	}).String()
 
@@ -187,7 +187,7 @@ func (s *Server) UpdateSpec(ctx context.Context, q *ApplicationSpecRequest) (*ap
 	if err != nil {
 		return nil, err
 	}
-	_, err = s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Patch(*q.AppName, types.MergePatchType, patch)
+	_, err = s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Patch(*q.Name, types.MergePatchType, patch)
 	return &q.Spec, err
 }
 
@@ -361,8 +361,8 @@ func (s *Server) ensurePodBelongsToApp(applicationName string, podName, namespac
 	return nil
 }
 
-func (s *Server) DeletePod(ctx context.Context, q *DeletePodQuery) (*ApplicationResponse, error) {
-	config, namespace, err := s.getApplicationClusterConfig(*q.ApplicationName)
+func (s *Server) DeletePod(ctx context.Context, q *ApplicationDeletePodRequest) (*ApplicationResponse, error) {
+	config, namespace, err := s.getApplicationClusterConfig(*q.Name)
 	if err != nil {
 		return nil, err
 	}
@@ -370,7 +370,7 @@ func (s *Server) DeletePod(ctx context.Context, q *DeletePodQuery) (*Application
 	if err != nil {
 		return nil, err
 	}
-	err = s.ensurePodBelongsToApp(*q.ApplicationName, *q.PodName, namespace, kubeClientset)
+	err = s.ensurePodBelongsToApp(*q.Name, *q.PodName, namespace, kubeClientset)
 	if err != nil {
 		return nil, err
 	}
@@ -381,8 +381,8 @@ func (s *Server) DeletePod(ctx context.Context, q *DeletePodQuery) (*Application
 	return &ApplicationResponse{}, nil
 }
 
-func (s *Server) PodLogs(q *PodLogsQuery, ws ApplicationService_PodLogsServer) error {
-	config, namespace, err := s.getApplicationClusterConfig(*q.ApplicationName)
+func (s *Server) PodLogs(q *ApplicationPodLogsQuery, ws ApplicationService_PodLogsServer) error {
+	config, namespace, err := s.getApplicationClusterConfig(*q.Name)
 	if err != nil {
 		return err
 	}
@@ -390,7 +390,7 @@ func (s *Server) PodLogs(q *PodLogsQuery, ws ApplicationService_PodLogsServer) e
 	if err != nil {
 		return err
 	}
-	err = s.ensurePodBelongsToApp(*q.ApplicationName, *q.PodName, namespace, kubeClientset)
+	err = s.ensurePodBelongsToApp(*q.Name, *q.PodName, namespace, kubeClientset)
 	if err != nil {
 		return err
 	}
diff --git a/server/application/application.pb.go b/server/application/application.pb.go
index fa1315102393a..ce93ad30497df 100644
--- a/server/application/application.pb.go
+++ b/server/application/application.pb.go
@@ -14,7 +14,7 @@
 	It has these top-level messages:
 		ApplicationQuery
 		ApplicationResourceEventsQuery
-		ManifestQuery
+		ApplicationManifestQuery
 		ApplicationResponse
 		ApplicationCreateRequest
 		ApplicationUpdateRequest
@@ -22,8 +22,8 @@
 		ApplicationSyncRequest
 		ApplicationSpecRequest
 		ApplicationRollbackRequest
-		DeletePodQuery
-		PodLogsQuery
+		ApplicationDeletePodRequest
+		ApplicationPodLogsQuery
 		LogEntry
 */
 package application
@@ -74,9 +74,9 @@ func (m *ApplicationQuery) GetName() string {
 
 // ApplicationEventsQuery is a query for application resource events
 type ApplicationResourceEventsQuery struct {
-	AppName          *string `protobuf:"bytes,1,req,name=appName" json:"appName,omitempty"`
-	ResName          *string `protobuf:"bytes,2,req,name=resName" json:"resName,omitempty"`
-	ResUid           *string `protobuf:"bytes,3,req,name=resUid" json:"resUid,omitempty"`
+	Name             *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	ResourceName     string  `protobuf:"bytes,2,req,name=resourceName" json:"resourceName"`
+	ResourceUID      string  `protobuf:"bytes,3,req,name=resourceUID" json:"resourceUID"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
@@ -87,49 +87,51 @@ func (*ApplicationResourceEventsQuery) Descriptor() ([]byte, []int) {
 	return fileDescriptorApplication, []int{1}
 }
 
-func (m *ApplicationResourceEventsQuery) GetAppName() string {
-	if m != nil && m.AppName != nil {
-		return *m.AppName
+func (m *ApplicationResourceEventsQuery) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
 
-func (m *ApplicationResourceEventsQuery) GetResName() string {
-	if m != nil && m.ResName != nil {
-		return *m.ResName
+func (m *ApplicationResourceEventsQuery) GetResourceName() string {
+	if m != nil {
+		return m.ResourceName
 	}
 	return ""
 }
 
-func (m *ApplicationResourceEventsQuery) GetResUid() string {
-	if m != nil && m.ResUid != nil {
-		return *m.ResUid
+func (m *ApplicationResourceEventsQuery) GetResourceUID() string {
+	if m != nil {
+		return m.ResourceUID
 	}
 	return ""
 }
 
 // ManifestQuery is a query for manifest resources
-type ManifestQuery struct {
-	AppName          *string `protobuf:"bytes,1,req,name=appName" json:"appName,omitempty"`
-	Revision         *string `protobuf:"bytes,2,opt,name=revision" json:"revision,omitempty"`
+type ApplicationManifestQuery struct {
+	Name             *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	Revision         string  `protobuf:"bytes,2,opt,name=revision" json:"revision"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *ManifestQuery) Reset()                    { *m = ManifestQuery{} }
-func (m *ManifestQuery) String() string            { return proto.CompactTextString(m) }
-func (*ManifestQuery) ProtoMessage()               {}
-func (*ManifestQuery) Descriptor() ([]byte, []int) { return fileDescriptorApplication, []int{2} }
+func (m *ApplicationManifestQuery) Reset()         { *m = ApplicationManifestQuery{} }
+func (m *ApplicationManifestQuery) String() string { return proto.CompactTextString(m) }
+func (*ApplicationManifestQuery) ProtoMessage()    {}
+func (*ApplicationManifestQuery) Descriptor() ([]byte, []int) {
+	return fileDescriptorApplication, []int{2}
+}
 
-func (m *ManifestQuery) GetAppName() string {
-	if m != nil && m.AppName != nil {
-		return *m.AppName
+func (m *ApplicationManifestQuery) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
 
-func (m *ManifestQuery) GetRevision() string {
-	if m != nil && m.Revision != nil {
-		return *m.Revision
+func (m *ApplicationManifestQuery) GetRevision() string {
+	if m != nil {
+		return m.Revision
 	}
 	return ""
 }
@@ -145,7 +147,7 @@ func (*ApplicationResponse) Descriptor() ([]byte, []int) { return fileDescriptor
 
 type ApplicationCreateRequest struct {
 	Application      github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application `protobuf:"bytes,1,req,name=application" json:"application"`
-	Upsert           *bool                                                                 `protobuf:"varint,2,req,name=upsert" json:"upsert,omitempty"`
+	Upsert           *bool                                                                 `protobuf:"varint,2,opt,name=upsert" json:"upsert,omitempty"`
 	XXX_unrecognized []byte                                                                `json:"-"`
 }
 
@@ -262,7 +264,7 @@ func (m *ApplicationSyncRequest) GetPrune() bool {
 
 // ApplicationSpecRequest is a request to update application spec
 type ApplicationSpecRequest struct {
-	AppName          *string                                                                   `protobuf:"bytes,1,req,name=appName" json:"appName,omitempty"`
+	Name             *string                                                                   `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
 	Spec             github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.ApplicationSpec `protobuf:"bytes,2,req,name=spec" json:"spec"`
 	XXX_unrecognized []byte                                                                    `json:"-"`
 }
@@ -274,9 +276,9 @@ func (*ApplicationSpecRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptorApplication, []int{8}
 }
 
-func (m *ApplicationSpecRequest) GetAppName() string {
-	if m != nil && m.AppName != nil {
-		return *m.AppName
+func (m *ApplicationSpecRequest) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
@@ -331,33 +333,35 @@ func (m *ApplicationRollbackRequest) GetPrune() bool {
 	return false
 }
 
-type DeletePodQuery struct {
-	ApplicationName  *string `protobuf:"bytes,1,req,name=applicationName" json:"applicationName,omitempty"`
+type ApplicationDeletePodRequest struct {
+	Name             *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
 	PodName          *string `protobuf:"bytes,2,req,name=podName" json:"podName,omitempty"`
 	XXX_unrecognized []byte  `json:"-"`
 }
 
-func (m *DeletePodQuery) Reset()                    { *m = DeletePodQuery{} }
-func (m *DeletePodQuery) String() string            { return proto.CompactTextString(m) }
-func (*DeletePodQuery) ProtoMessage()               {}
-func (*DeletePodQuery) Descriptor() ([]byte, []int) { return fileDescriptorApplication, []int{10} }
+func (m *ApplicationDeletePodRequest) Reset()         { *m = ApplicationDeletePodRequest{} }
+func (m *ApplicationDeletePodRequest) String() string { return proto.CompactTextString(m) }
+func (*ApplicationDeletePodRequest) ProtoMessage()    {}
+func (*ApplicationDeletePodRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptorApplication, []int{10}
+}
 
-func (m *DeletePodQuery) GetApplicationName() string {
-	if m != nil && m.ApplicationName != nil {
-		return *m.ApplicationName
+func (m *ApplicationDeletePodRequest) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
 
-func (m *DeletePodQuery) GetPodName() string {
+func (m *ApplicationDeletePodRequest) GetPodName() string {
 	if m != nil && m.PodName != nil {
 		return *m.PodName
 	}
 	return ""
 }
 
-type PodLogsQuery struct {
-	ApplicationName  *string                                    `protobuf:"bytes,1,req,name=applicationName" json:"applicationName,omitempty"`
+type ApplicationPodLogsQuery struct {
+	Name             *string                                    `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
 	PodName          *string                                    `protobuf:"bytes,2,req,name=podName" json:"podName,omitempty"`
 	Container        string                                     `protobuf:"bytes,3,req,name=container" json:"container"`
 	SinceSeconds     int64                                      `protobuf:"varint,4,req,name=sinceSeconds" json:"sinceSeconds"`
@@ -367,54 +371,56 @@ type PodLogsQuery struct {
 	XXX_unrecognized []byte                                     `json:"-"`
 }
 
-func (m *PodLogsQuery) Reset()                    { *m = PodLogsQuery{} }
-func (m *PodLogsQuery) String() string            { return proto.CompactTextString(m) }
-func (*PodLogsQuery) ProtoMessage()               {}
-func (*PodLogsQuery) Descriptor() ([]byte, []int) { return fileDescriptorApplication, []int{11} }
+func (m *ApplicationPodLogsQuery) Reset()         { *m = ApplicationPodLogsQuery{} }
+func (m *ApplicationPodLogsQuery) String() string { return proto.CompactTextString(m) }
+func (*ApplicationPodLogsQuery) ProtoMessage()    {}
+func (*ApplicationPodLogsQuery) Descriptor() ([]byte, []int) {
+	return fileDescriptorApplication, []int{11}
+}
 
-func (m *PodLogsQuery) GetApplicationName() string {
-	if m != nil && m.ApplicationName != nil {
-		return *m.ApplicationName
+func (m *ApplicationPodLogsQuery) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
 	}
 	return ""
 }
 
-func (m *PodLogsQuery) GetPodName() string {
+func (m *ApplicationPodLogsQuery) GetPodName() string {
 	if m != nil && m.PodName != nil {
 		return *m.PodName
 	}
 	return ""
 }
 
-func (m *PodLogsQuery) GetContainer() string {
+func (m *ApplicationPodLogsQuery) GetContainer() string {
 	if m != nil {
 		return m.Container
 	}
 	return ""
 }
 
-func (m *PodLogsQuery) GetSinceSeconds() int64 {
+func (m *ApplicationPodLogsQuery) GetSinceSeconds() int64 {
 	if m != nil {
 		return m.SinceSeconds
 	}
 	return 0
 }
 
-func (m *PodLogsQuery) GetSinceTime() *k8s_io_apimachinery_pkg_apis_meta_v1.Time {
+func (m *ApplicationPodLogsQuery) GetSinceTime() *k8s_io_apimachinery_pkg_apis_meta_v1.Time {
 	if m != nil {
 		return m.SinceTime
 	}
 	return nil
 }
 
-func (m *PodLogsQuery) GetTailLines() int64 {
+func (m *ApplicationPodLogsQuery) GetTailLines() int64 {
 	if m != nil {
 		return m.TailLines
 	}
 	return 0
 }
 
-func (m *PodLogsQuery) GetFollow() bool {
+func (m *ApplicationPodLogsQuery) GetFollow() bool {
 	if m != nil {
 		return m.Follow
 	}
@@ -449,7 +455,7 @@ func (m *LogEntry) GetTimeStamp() k8s_io_apimachinery_pkg_apis_meta_v1.Time {
 func init() {
 	proto.RegisterType((*ApplicationQuery)(nil), "application.ApplicationQuery")
 	proto.RegisterType((*ApplicationResourceEventsQuery)(nil), "application.ApplicationResourceEventsQuery")
-	proto.RegisterType((*ManifestQuery)(nil), "application.ManifestQuery")
+	proto.RegisterType((*ApplicationManifestQuery)(nil), "application.ApplicationManifestQuery")
 	proto.RegisterType((*ApplicationResponse)(nil), "application.ApplicationResponse")
 	proto.RegisterType((*ApplicationCreateRequest)(nil), "application.ApplicationCreateRequest")
 	proto.RegisterType((*ApplicationUpdateRequest)(nil), "application.ApplicationUpdateRequest")
@@ -457,8 +463,8 @@ func init() {
 	proto.RegisterType((*ApplicationSyncRequest)(nil), "application.ApplicationSyncRequest")
 	proto.RegisterType((*ApplicationSpecRequest)(nil), "application.ApplicationSpecRequest")
 	proto.RegisterType((*ApplicationRollbackRequest)(nil), "application.ApplicationRollbackRequest")
-	proto.RegisterType((*DeletePodQuery)(nil), "application.DeletePodQuery")
-	proto.RegisterType((*PodLogsQuery)(nil), "application.PodLogsQuery")
+	proto.RegisterType((*ApplicationDeletePodRequest)(nil), "application.ApplicationDeletePodRequest")
+	proto.RegisterType((*ApplicationPodLogsQuery)(nil), "application.ApplicationPodLogsQuery")
 	proto.RegisterType((*LogEntry)(nil), "application.LogEntry")
 }
 
@@ -484,7 +490,7 @@ type ApplicationServiceClient interface {
 	// Get returns an application by name
 	Get(ctx context.Context, in *ApplicationQuery, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// GetManifests returns application manifests
-	GetManifests(ctx context.Context, in *ManifestQuery, opts ...grpc.CallOption) (*repository.ManifestResponse, error)
+	GetManifests(ctx context.Context, in *ApplicationManifestQuery, opts ...grpc.CallOption) (*repository.ManifestResponse, error)
 	// Update updates an application
 	Update(ctx context.Context, in *ApplicationUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// Update updates an application spec
@@ -496,9 +502,9 @@ type ApplicationServiceClient interface {
 	// Sync syncs an application to its target state
 	Rollback(ctx context.Context, in *ApplicationRollbackRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	DeletePod(ctx context.Context, in *DeletePodQuery, opts ...grpc.CallOption) (*ApplicationResponse, error)
+	DeletePod(ctx context.Context, in *ApplicationDeletePodRequest, opts ...grpc.CallOption) (*ApplicationResponse, error)
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	PodLogs(ctx context.Context, in *PodLogsQuery, opts ...grpc.CallOption) (ApplicationService_PodLogsClient, error)
+	PodLogs(ctx context.Context, in *ApplicationPodLogsQuery, opts ...grpc.CallOption) (ApplicationService_PodLogsClient, error)
 }
 
 type applicationServiceClient struct {
@@ -577,7 +583,7 @@ func (c *applicationServiceClient) Get(ctx context.Context, in *ApplicationQuery
 	return out, nil
 }
 
-func (c *applicationServiceClient) GetManifests(ctx context.Context, in *ManifestQuery, opts ...grpc.CallOption) (*repository.ManifestResponse, error) {
+func (c *applicationServiceClient) GetManifests(ctx context.Context, in *ApplicationManifestQuery, opts ...grpc.CallOption) (*repository.ManifestResponse, error) {
 	out := new(repository.ManifestResponse)
 	err := grpc.Invoke(ctx, "/application.ApplicationService/GetManifests", in, out, c.cc, opts...)
 	if err != nil {
@@ -631,7 +637,7 @@ func (c *applicationServiceClient) Rollback(ctx context.Context, in *Application
 	return out, nil
 }
 
-func (c *applicationServiceClient) DeletePod(ctx context.Context, in *DeletePodQuery, opts ...grpc.CallOption) (*ApplicationResponse, error) {
+func (c *applicationServiceClient) DeletePod(ctx context.Context, in *ApplicationDeletePodRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) {
 	out := new(ApplicationResponse)
 	err := grpc.Invoke(ctx, "/application.ApplicationService/DeletePod", in, out, c.cc, opts...)
 	if err != nil {
@@ -640,7 +646,7 @@ func (c *applicationServiceClient) DeletePod(ctx context.Context, in *DeletePodQ
 	return out, nil
 }
 
-func (c *applicationServiceClient) PodLogs(ctx context.Context, in *PodLogsQuery, opts ...grpc.CallOption) (ApplicationService_PodLogsClient, error) {
+func (c *applicationServiceClient) PodLogs(ctx context.Context, in *ApplicationPodLogsQuery, opts ...grpc.CallOption) (ApplicationService_PodLogsClient, error) {
 	stream, err := grpc.NewClientStream(ctx, &_ApplicationService_serviceDesc.Streams[1], c.cc, "/application.ApplicationService/PodLogs", opts...)
 	if err != nil {
 		return nil, err
@@ -686,7 +692,7 @@ type ApplicationServiceServer interface {
 	// Get returns an application by name
 	Get(context.Context, *ApplicationQuery) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// GetManifests returns application manifests
-	GetManifests(context.Context, *ManifestQuery) (*repository.ManifestResponse, error)
+	GetManifests(context.Context, *ApplicationManifestQuery) (*repository.ManifestResponse, error)
 	// Update updates an application
 	Update(context.Context, *ApplicationUpdateRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// Update updates an application spec
@@ -698,9 +704,9 @@ type ApplicationServiceServer interface {
 	// Sync syncs an application to its target state
 	Rollback(context.Context, *ApplicationRollbackRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Application, error)
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	DeletePod(context.Context, *DeletePodQuery) (*ApplicationResponse, error)
+	DeletePod(context.Context, *ApplicationDeletePodRequest) (*ApplicationResponse, error)
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	PodLogs(*PodLogsQuery, ApplicationService_PodLogsServer) error
+	PodLogs(*ApplicationPodLogsQuery, ApplicationService_PodLogsServer) error
 }
 
 func RegisterApplicationServiceServer(s *grpc.Server, srv ApplicationServiceServer) {
@@ -801,7 +807,7 @@ func _ApplicationService_Get_Handler(srv interface{}, ctx context.Context, dec f
 }
 
 func _ApplicationService_GetManifests_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ManifestQuery)
+	in := new(ApplicationManifestQuery)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -813,7 +819,7 @@ func _ApplicationService_GetManifests_Handler(srv interface{}, ctx context.Conte
 		FullMethod: "/application.ApplicationService/GetManifests",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ApplicationServiceServer).GetManifests(ctx, req.(*ManifestQuery))
+		return srv.(ApplicationServiceServer).GetManifests(ctx, req.(*ApplicationManifestQuery))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -909,7 +915,7 @@ func _ApplicationService_Rollback_Handler(srv interface{}, ctx context.Context,
 }
 
 func _ApplicationService_DeletePod_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeletePodQuery)
+	in := new(ApplicationDeletePodRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -921,13 +927,13 @@ func _ApplicationService_DeletePod_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/application.ApplicationService/DeletePod",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ApplicationServiceServer).DeletePod(ctx, req.(*DeletePodQuery))
+		return srv.(ApplicationServiceServer).DeletePod(ctx, req.(*ApplicationDeletePodRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _ApplicationService_PodLogs_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(PodLogsQuery)
+	m := new(ApplicationPodLogsQuery)
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
@@ -1053,37 +1059,29 @@ func (m *ApplicationResourceEventsQuery) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.AppName == nil {
-		return 0, proto.NewRequiredNotSetError("appName")
+	if m.Name == nil {
+		return 0, proto.NewRequiredNotSetError("name")
 	} else {
 		dAtA[i] = 0xa
 		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.AppName)))
-		i += copy(dAtA[i:], *m.AppName)
-	}
-	if m.ResName == nil {
-		return 0, proto.NewRequiredNotSetError("resName")
-	} else {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResName)))
-		i += copy(dAtA[i:], *m.ResName)
-	}
-	if m.ResUid == nil {
-		return 0, proto.NewRequiredNotSetError("resUid")
-	} else {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ResUid)))
-		i += copy(dAtA[i:], *m.ResUid)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i += copy(dAtA[i:], *m.Name)
 	}
+	dAtA[i] = 0x12
+	i++
+	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceName)))
+	i += copy(dAtA[i:], m.ResourceName)
+	dAtA[i] = 0x1a
+	i++
+	i = encodeVarintApplication(dAtA, i, uint64(len(m.ResourceUID)))
+	i += copy(dAtA[i:], m.ResourceUID)
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
 	return i, nil
 }
 
-func (m *ManifestQuery) Marshal() (dAtA []byte, err error) {
+func (m *ApplicationManifestQuery) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalTo(dAtA)
@@ -1093,25 +1091,23 @@ func (m *ManifestQuery) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ManifestQuery) MarshalTo(dAtA []byte) (int, error) {
+func (m *ApplicationManifestQuery) MarshalTo(dAtA []byte) (int, error) {
 	var i int
 	_ = i
 	var l int
 	_ = l
-	if m.AppName == nil {
-		return 0, proto.NewRequiredNotSetError("appName")
+	if m.Name == nil {
+		return 0, proto.NewRequiredNotSetError("name")
 	} else {
 		dAtA[i] = 0xa
 		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.AppName)))
-		i += copy(dAtA[i:], *m.AppName)
-	}
-	if m.Revision != nil {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Revision)))
-		i += copy(dAtA[i:], *m.Revision)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i += copy(dAtA[i:], *m.Name)
 	}
+	dAtA[i] = 0x12
+	i++
+	i = encodeVarintApplication(dAtA, i, uint64(len(m.Revision)))
+	i += copy(dAtA[i:], m.Revision)
 	if m.XXX_unrecognized != nil {
 		i += copy(dAtA[i:], m.XXX_unrecognized)
 	}
@@ -1162,9 +1158,7 @@ func (m *ApplicationCreateRequest) MarshalTo(dAtA []byte) (int, error) {
 		return 0, err
 	}
 	i += n1
-	if m.Upsert == nil {
-		return 0, proto.NewRequiredNotSetError("upsert")
-	} else {
+	if m.Upsert != nil {
 		dAtA[i] = 0x10
 		i++
 		if *m.Upsert {
@@ -1312,13 +1306,13 @@ func (m *ApplicationSpecRequest) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.AppName == nil {
-		return 0, proto.NewRequiredNotSetError("appName")
+	if m.Name == nil {
+		return 0, proto.NewRequiredNotSetError("name")
 	} else {
 		dAtA[i] = 0xa
 		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.AppName)))
-		i += copy(dAtA[i:], *m.AppName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i += copy(dAtA[i:], *m.Name)
 	}
 	dAtA[i] = 0x12
 	i++
@@ -1382,7 +1376,7 @@ func (m *ApplicationRollbackRequest) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
-func (m *DeletePodQuery) Marshal() (dAtA []byte, err error) {
+func (m *ApplicationDeletePodRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalTo(dAtA)
@@ -1392,18 +1386,18 @@ func (m *DeletePodQuery) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *DeletePodQuery) MarshalTo(dAtA []byte) (int, error) {
+func (m *ApplicationDeletePodRequest) MarshalTo(dAtA []byte) (int, error) {
 	var i int
 	_ = i
 	var l int
 	_ = l
-	if m.ApplicationName == nil {
-		return 0, proto.NewRequiredNotSetError("applicationName")
+	if m.Name == nil {
+		return 0, proto.NewRequiredNotSetError("name")
 	} else {
 		dAtA[i] = 0xa
 		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ApplicationName)))
-		i += copy(dAtA[i:], *m.ApplicationName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i += copy(dAtA[i:], *m.Name)
 	}
 	if m.PodName == nil {
 		return 0, proto.NewRequiredNotSetError("podName")
@@ -1419,7 +1413,7 @@ func (m *DeletePodQuery) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
-func (m *PodLogsQuery) Marshal() (dAtA []byte, err error) {
+func (m *ApplicationPodLogsQuery) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalTo(dAtA)
@@ -1429,18 +1423,18 @@ func (m *PodLogsQuery) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *PodLogsQuery) MarshalTo(dAtA []byte) (int, error) {
+func (m *ApplicationPodLogsQuery) MarshalTo(dAtA []byte) (int, error) {
 	var i int
 	_ = i
 	var l int
 	_ = l
-	if m.ApplicationName == nil {
-		return 0, proto.NewRequiredNotSetError("applicationName")
+	if m.Name == nil {
+		return 0, proto.NewRequiredNotSetError("name")
 	} else {
 		dAtA[i] = 0xa
 		i++
-		i = encodeVarintApplication(dAtA, i, uint64(len(*m.ApplicationName)))
-		i += copy(dAtA[i:], *m.ApplicationName)
+		i = encodeVarintApplication(dAtA, i, uint64(len(*m.Name)))
+		i += copy(dAtA[i:], *m.Name)
 	}
 	if m.PodName == nil {
 		return 0, proto.NewRequiredNotSetError("podName")
@@ -1542,35 +1536,29 @@ func (m *ApplicationQuery) Size() (n int) {
 func (m *ApplicationResourceEventsQuery) Size() (n int) {
 	var l int
 	_ = l
-	if m.AppName != nil {
-		l = len(*m.AppName)
-		n += 1 + l + sovApplication(uint64(l))
-	}
-	if m.ResName != nil {
-		l = len(*m.ResName)
-		n += 1 + l + sovApplication(uint64(l))
-	}
-	if m.ResUid != nil {
-		l = len(*m.ResUid)
+	if m.Name != nil {
+		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
+	l = len(m.ResourceName)
+	n += 1 + l + sovApplication(uint64(l))
+	l = len(m.ResourceUID)
+	n += 1 + l + sovApplication(uint64(l))
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
 	return n
 }
 
-func (m *ManifestQuery) Size() (n int) {
+func (m *ApplicationManifestQuery) Size() (n int) {
 	var l int
 	_ = l
-	if m.AppName != nil {
-		l = len(*m.AppName)
-		n += 1 + l + sovApplication(uint64(l))
-	}
-	if m.Revision != nil {
-		l = len(*m.Revision)
+	if m.Name != nil {
+		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
+	l = len(m.Revision)
+	n += 1 + l + sovApplication(uint64(l))
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -1647,8 +1635,8 @@ func (m *ApplicationSyncRequest) Size() (n int) {
 func (m *ApplicationSpecRequest) Size() (n int) {
 	var l int
 	_ = l
-	if m.AppName != nil {
-		l = len(*m.AppName)
+	if m.Name != nil {
+		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
 	l = m.Spec.Size()
@@ -1675,11 +1663,11 @@ func (m *ApplicationRollbackRequest) Size() (n int) {
 	return n
 }
 
-func (m *DeletePodQuery) Size() (n int) {
+func (m *ApplicationDeletePodRequest) Size() (n int) {
 	var l int
 	_ = l
-	if m.ApplicationName != nil {
-		l = len(*m.ApplicationName)
+	if m.Name != nil {
+		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
 	if m.PodName != nil {
@@ -1692,11 +1680,11 @@ func (m *DeletePodQuery) Size() (n int) {
 	return n
 }
 
-func (m *PodLogsQuery) Size() (n int) {
+func (m *ApplicationPodLogsQuery) Size() (n int) {
 	var l int
 	_ = l
-	if m.ApplicationName != nil {
-		l = len(*m.ApplicationName)
+	if m.Name != nil {
+		l = len(*m.Name)
 		n += 1 + l + sovApplication(uint64(l))
 	}
 	if m.PodName != nil {
@@ -1857,7 +1845,7 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AppName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1883,12 +1871,12 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			s := string(dAtA[iNdEx:postIndex])
-			m.AppName = &s
+			m.Name = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ResName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ResourceName", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1913,13 +1901,12 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.ResName = &s
+			m.ResourceName = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000002)
 		case 3:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ResUid", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ResourceUID", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1944,8 +1931,7 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.ResUid = &s
+			m.ResourceUID = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000004)
 		default:
@@ -1965,13 +1951,13 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("appName")
+		return proto.NewRequiredNotSetError("name")
 	}
 	if hasFields[0]&uint64(0x00000002) == 0 {
-		return proto.NewRequiredNotSetError("resName")
+		return proto.NewRequiredNotSetError("resourceName")
 	}
 	if hasFields[0]&uint64(0x00000004) == 0 {
-		return proto.NewRequiredNotSetError("resUid")
+		return proto.NewRequiredNotSetError("resourceUID")
 	}
 
 	if iNdEx > l {
@@ -1979,7 +1965,7 @@ func (m *ApplicationResourceEventsQuery) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ManifestQuery) Unmarshal(dAtA []byte) error {
+func (m *ApplicationManifestQuery) Unmarshal(dAtA []byte) error {
 	var hasFields [1]uint64
 	l := len(dAtA)
 	iNdEx := 0
@@ -2003,15 +1989,15 @@ func (m *ManifestQuery) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ManifestQuery: wiretype end group for non-group")
+			return fmt.Errorf("proto: ApplicationManifestQuery: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ManifestQuery: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ApplicationManifestQuery: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AppName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2037,7 +2023,7 @@ func (m *ManifestQuery) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			s := string(dAtA[iNdEx:postIndex])
-			m.AppName = &s
+			m.Name = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
@@ -2067,8 +2053,7 @@ func (m *ManifestQuery) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.Revision = &s
+			m.Revision = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -2087,7 +2072,7 @@ func (m *ManifestQuery) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("appName")
+		return proto.NewRequiredNotSetError("name")
 	}
 
 	if iNdEx > l {
@@ -2228,7 +2213,6 @@ func (m *ApplicationCreateRequest) Unmarshal(dAtA []byte) error {
 			}
 			b := bool(v != 0)
 			m.Upsert = &b
-			hasFields[0] |= uint64(0x00000002)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipApplication(dAtA[iNdEx:])
@@ -2248,9 +2232,6 @@ func (m *ApplicationCreateRequest) Unmarshal(dAtA []byte) error {
 	if hasFields[0]&uint64(0x00000001) == 0 {
 		return proto.NewRequiredNotSetError("application")
 	}
-	if hasFields[0]&uint64(0x00000002) == 0 {
-		return proto.NewRequiredNotSetError("upsert")
-	}
 
 	if iNdEx > l {
 		return io.ErrUnexpectedEOF
@@ -2649,7 +2630,7 @@ func (m *ApplicationSpecRequest) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field AppName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2675,7 +2656,7 @@ func (m *ApplicationSpecRequest) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			s := string(dAtA[iNdEx:postIndex])
-			m.AppName = &s
+			m.Name = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
@@ -2726,7 +2707,7 @@ func (m *ApplicationSpecRequest) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("appName")
+		return proto.NewRequiredNotSetError("name")
 	}
 	if hasFields[0]&uint64(0x00000002) == 0 {
 		return proto.NewRequiredNotSetError("spec")
@@ -2894,7 +2875,7 @@ func (m *ApplicationRollbackRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *DeletePodQuery) Unmarshal(dAtA []byte) error {
+func (m *ApplicationDeletePodRequest) Unmarshal(dAtA []byte) error {
 	var hasFields [1]uint64
 	l := len(dAtA)
 	iNdEx := 0
@@ -2918,15 +2899,15 @@ func (m *DeletePodQuery) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: DeletePodQuery: wiretype end group for non-group")
+			return fmt.Errorf("proto: ApplicationDeletePodRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: DeletePodQuery: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ApplicationDeletePodRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ApplicationName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -2952,7 +2933,7 @@ func (m *DeletePodQuery) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			s := string(dAtA[iNdEx:postIndex])
-			m.ApplicationName = &s
+			m.Name = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
@@ -3003,7 +2984,7 @@ func (m *DeletePodQuery) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("applicationName")
+		return proto.NewRequiredNotSetError("name")
 	}
 	if hasFields[0]&uint64(0x00000002) == 0 {
 		return proto.NewRequiredNotSetError("podName")
@@ -3014,7 +2995,7 @@ func (m *DeletePodQuery) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *PodLogsQuery) Unmarshal(dAtA []byte) error {
+func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error {
 	var hasFields [1]uint64
 	l := len(dAtA)
 	iNdEx := 0
@@ -3038,15 +3019,15 @@ func (m *PodLogsQuery) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: PodLogsQuery: wiretype end group for non-group")
+			return fmt.Errorf("proto: ApplicationPodLogsQuery: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: PodLogsQuery: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ApplicationPodLogsQuery: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ApplicationName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -3072,7 +3053,7 @@ func (m *PodLogsQuery) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			s := string(dAtA[iNdEx:postIndex])
-			m.ApplicationName = &s
+			m.Name = &s
 			iNdEx = postIndex
 			hasFields[0] |= uint64(0x00000001)
 		case 2:
@@ -3247,7 +3228,7 @@ func (m *PodLogsQuery) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("applicationName")
+		return proto.NewRequiredNotSetError("name")
 	}
 	if hasFields[0]&uint64(0x00000002) == 0 {
 		return proto.NewRequiredNotSetError("podName")
@@ -3497,79 +3478,77 @@ var (
 func init() { proto.RegisterFile("server/application/application.proto", fileDescriptorApplication) }
 
 var fileDescriptorApplication = []byte{
-	// 1169 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4f, 0x6f, 0x1c, 0x35,
-	0x14, 0x67, 0x36, 0x9b, 0x64, 0xd7, 0x09, 0x14, 0x99, 0x36, 0xda, 0x4e, 0xf3, 0x4f, 0x4e, 0x43,
-	0x97, 0x54, 0x9d, 0x49, 0x22, 0x10, 0xa8, 0x2a, 0x07, 0x42, 0x43, 0x5b, 0x14, 0xaa, 0xb0, 0x69,
-	0x85, 0xc4, 0x05, 0xb9, 0x33, 0xaf, 0x9b, 0x21, 0xb3, 0xf6, 0x60, 0x7b, 0x17, 0x6d, 0xab, 0x1c,
-	0xe0, 0x80, 0x80, 0x0b, 0x42, 0x5c, 0x7a, 0x03, 0x71, 0x44, 0xe5, 0x7b, 0xf4, 0x88, 0xc4, 0xbd,
-	0x42, 0x11, 0x1f, 0x04, 0xd9, 0x33, 0xb3, 0xe3, 0x49, 0xb2, 0x1b, 0xfe, 0xac, 0xc4, 0xcd, 0x7e,
-	0xef, 0xf9, 0xbd, 0x9f, 0x7f, 0xef, 0x8d, 0xdf, 0x1b, 0x74, 0x59, 0x82, 0xe8, 0x81, 0xf0, 0x69,
-	0x92, 0xc4, 0x51, 0x40, 0x55, 0xc4, 0x99, 0xbd, 0xf6, 0x12, 0xc1, 0x15, 0xc7, 0x33, 0x96, 0xc8,
-	0x3d, 0xdf, 0xe6, 0x6d, 0x6e, 0xe4, 0xbe, 0x5e, 0xa5, 0x26, 0xee, 0x7c, 0x9b, 0xf3, 0x76, 0x0c,
-	0x3e, 0x4d, 0x22, 0x9f, 0x32, 0xc6, 0x95, 0x31, 0x96, 0x99, 0x96, 0x1c, 0xbc, 0x25, 0xbd, 0x88,
-	0x1b, 0x6d, 0xc0, 0x05, 0xf8, 0xbd, 0x0d, 0xbf, 0x0d, 0x0c, 0x04, 0x55, 0x10, 0x66, 0x36, 0xaf,
-	0x17, 0x36, 0x1d, 0x1a, 0xec, 0x47, 0x0c, 0x44, 0xdf, 0x4f, 0x0e, 0xda, 0x5a, 0x20, 0xfd, 0x0e,
-	0x28, 0x7a, 0xda, 0xa9, 0x3b, 0xed, 0x48, 0xed, 0x77, 0x1f, 0x78, 0x01, 0xef, 0xf8, 0x54, 0x18,
-	0x60, 0x9f, 0x9a, 0xc5, 0xb5, 0x20, 0x2c, 0x4e, 0xdb, 0xd7, 0xeb, 0x6d, 0xd0, 0x38, 0xd9, 0xa7,
-	0x27, 0x5d, 0x6d, 0x8d, 0x72, 0x25, 0x20, 0xe1, 0x19, 0x57, 0x66, 0x19, 0x29, 0x2e, 0xfa, 0xd6,
-	0x32, 0xf5, 0x41, 0x5e, 0x45, 0x2f, 0xbf, 0x53, 0xc4, 0xfa, 0xb0, 0x0b, 0xa2, 0x8f, 0x31, 0xaa,
-	0x32, 0xda, 0x81, 0x86, 0xb3, 0xec, 0x34, 0xeb, 0x2d, 0xb3, 0x26, 0x31, 0x5a, 0xb4, 0xec, 0x5a,
-	0x20, 0x79, 0x57, 0x04, 0xb0, 0xdd, 0x03, 0xa6, 0x64, 0x7a, 0xaa, 0x81, 0xa6, 0x69, 0x92, 0xdc,
-	0x4d, 0x0f, 0x56, 0x9a, 0xf5, 0x56, 0xbe, 0xd5, 0x1a, 0x01, 0xd2, 0x68, 0x2a, 0xa9, 0x26, 0xdb,
-	0xe2, 0x39, 0x34, 0x25, 0x40, 0xde, 0x8f, 0xc2, 0xc6, 0x84, 0x51, 0x64, 0x3b, 0xb2, 0x8d, 0x5e,
-	0xfc, 0x80, 0xb2, 0xe8, 0x21, 0x48, 0x75, 0x96, 0x73, 0x17, 0xd5, 0x04, 0xf4, 0x22, 0x19, 0x71,
-	0xd6, 0xa8, 0x18, 0xc0, 0x83, 0x3d, 0xb9, 0x80, 0x5e, 0x29, 0x83, 0x4e, 0x38, 0x93, 0x40, 0x7e,
-	0x76, 0x50, 0xc3, 0x92, 0xbf, 0x2b, 0x80, 0x2a, 0x68, 0xc1, 0x67, 0x5d, 0x90, 0x0a, 0x33, 0x64,
-	0x17, 0x8f, 0x89, 0x36, 0xb3, 0xf9, 0x9e, 0x57, 0x50, 0xed, 0xe5, 0x54, 0x9b, 0xc5, 0x27, 0x41,
-	0xe8, 0x25, 0x07, 0x6d, 0x4f, 0x67, 0xcd, 0xb3, 0x0b, 0x31, 0xcf, 0x9a, 0x67, 0x45, 0xda, 0xaa,
-	0x3e, 0x7b, 0xbe, 0xf4, 0x42, 0xcb, 0x0e, 0xa0, 0x29, 0xe8, 0x26, 0x12, 0x84, 0x32, 0xdc, 0xd4,
-	0x5a, 0xd9, 0x8e, 0x7c, 0x5b, 0x06, 0x79, 0x3f, 0x09, 0xff, 0x3f, 0x90, 0xe4, 0x76, 0x09, 0xcb,
-	0x4d, 0x88, 0xa1, 0xc0, 0x52, 0x54, 0x4b, 0x25, 0xaf, 0x16, 0x9d, 0xae, 0x80, 0xca, 0x80, 0x86,
-	0x60, 0x72, 0x52, 0x6b, 0xe5, 0x5b, 0xf2, 0xb5, 0x83, 0xe6, 0x2c, 0x57, 0x7b, 0x7d, 0x16, 0x8c,
-	0x72, 0xb4, 0x5c, 0xca, 0x6e, 0xa5, 0x59, 0xcf, 0xd0, 0x0d, 0xa4, 0x78, 0x1e, 0x4d, 0x85, 0xa2,
-	0xdf, 0xea, 0x32, 0x53, 0x42, 0xb5, 0x4c, 0x9f, 0xc9, 0xb0, 0x8b, 0x26, 0x13, 0xd1, 0x65, 0xd0,
-	0xa8, 0x5a, 0xca, 0x54, 0x44, 0x9e, 0x1c, 0x83, 0x92, 0xc0, 0x00, 0xca, 0xf0, 0x72, 0x0b, 0x51,
-	0x55, 0x26, 0x10, 0x18, 0x30, 0x33, 0x9b, 0xef, 0x8f, 0x87, 0x72, 0x1d, 0x3a, 0xc3, 0x66, 0xbc,
-	0x93, 0xaf, 0x1c, 0xe4, 0xda, 0x95, 0xcb, 0xe3, 0xf8, 0x01, 0x0d, 0x0e, 0x46, 0x31, 0xe5, 0xa2,
-	0x4a, 0x14, 0x1a, 0x58, 0x13, 0x5b, 0x48, 0xbb, 0x3a, 0x7a, 0xbe, 0x54, 0xb9, 0x73, 0xb3, 0x55,
-	0x89, 0xc2, 0xff, 0xc0, 0xd1, 0x3d, 0xf4, 0x52, 0x9a, 0xed, 0x5d, 0x1e, 0xa6, 0x5f, 0x62, 0x13,
-	0x9d, 0xb3, 0xae, 0x63, 0x51, 0x74, 0x5c, 0xac, 0x49, 0x4c, 0x78, 0x68, 0x7f, 0xf6, 0xd9, 0x96,
-	0x3c, 0xad, 0xa0, 0xd9, 0x5d, 0x1e, 0xee, 0xf0, 0xb6, 0x1c, 0x9b, 0x53, 0x4c, 0x50, 0x3d, 0xe0,
-	0x4c, 0x51, 0xfd, 0x0e, 0xa7, 0xcf, 0x49, 0x76, 0x95, 0x42, 0x8c, 0x9b, 0x68, 0x56, 0x46, 0x2c,
-	0x80, 0x3d, 0x08, 0x38, 0x0b, 0xa5, 0xb9, 0xf1, 0x44, 0x66, 0x56, 0xd2, 0xe0, 0xdb, 0xa8, 0x6e,
-	0xf6, 0xf7, 0xa2, 0x0e, 0x34, 0x26, 0x97, 0x9d, 0xe6, 0xcc, 0xe6, 0x9a, 0x97, 0x3e, 0xf8, 0x9e,
-	0xfd, 0xe0, 0x17, 0x49, 0xd6, 0x0f, 0xbe, 0xd7, 0xdb, 0xf0, 0xf4, 0x89, 0x56, 0x71, 0x58, 0xe3,
-	0x52, 0x34, 0x8a, 0x77, 0x22, 0x06, 0xb2, 0x31, 0x65, 0x05, 0x2c, 0xc4, 0x3a, 0x41, 0x0f, 0x79,
-	0x1c, 0xf3, 0xcf, 0x1b, 0xd3, 0x76, 0x82, 0x52, 0x19, 0x79, 0x84, 0x6a, 0x3b, 0xbc, 0xbd, 0xcd,
-	0x94, 0xe8, 0xe3, 0x45, 0x34, 0xad, 0xaf, 0x03, 0x4c, 0xa5, 0x0c, 0x65, 0xa6, 0xb9, 0x10, 0xdf,
-	0x45, 0x75, 0x15, 0x75, 0x60, 0x4f, 0xd1, 0x4e, 0x92, 0x15, 0xe9, 0x3f, 0xc0, 0x3d, 0x40, 0x96,
-	0xbb, 0xd8, 0xfc, 0xe5, 0x1c, 0xc2, 0x76, 0xa5, 0x82, 0xe8, 0x45, 0x01, 0xe0, 0xef, 0x1c, 0x54,
-	0xdd, 0x89, 0xa4, 0xc2, 0x0b, 0xa5, 0xe2, 0x3e, 0xde, 0x4a, 0xdc, 0x31, 0x7d, 0x20, 0x3a, 0x14,
-	0x99, 0xff, 0xf2, 0xf7, 0x3f, 0x7f, 0xa8, 0xcc, 0xe1, 0xf3, 0xa6, 0x2b, 0xf7, 0x36, 0xec, 0x26,
-	0x29, 0x35, 0x22, 0xac, 0xcd, 0xca, 0xad, 0x09, 0x5f, 0x1d, 0x86, 0xef, 0x94, 0x16, 0xe6, 0x2e,
-	0x58, 0x4c, 0x79, 0xba, 0xed, 0x6b, 0x5e, 0x8c, 0x81, 0x01, 0x70, 0xcd, 0x00, 0xb8, 0x82, 0x57,
-	0x4f, 0x03, 0xe0, 0x3f, 0xce, 0x9e, 0x88, 0x43, 0x1f, 0xd2, 0xd0, 0x3f, 0x3a, 0x68, 0xf2, 0x23,
-	0xaa, 0x82, 0xfd, 0xb3, 0x48, 0xda, 0x1d, 0x0f, 0x49, 0x26, 0x96, 0x41, 0x4b, 0x56, 0x0c, 0xd2,
-	0x05, 0x7c, 0x29, 0x47, 0x2a, 0x95, 0x00, 0xda, 0x29, 0x01, 0x5e, 0x77, 0xf0, 0x13, 0x07, 0x4d,
-	0xa5, 0xdd, 0x0f, 0xaf, 0x0e, 0x83, 0x58, 0xea, 0x8e, 0xee, 0x98, 0x7a, 0x0c, 0x59, 0x32, 0x00,
-	0x2f, 0x92, 0x53, 0x73, 0x79, 0xdd, 0x59, 0xc3, 0xdf, 0x3b, 0x68, 0xe2, 0x16, 0x9c, 0x59, 0x5f,
-	0xe3, 0xc2, 0x73, 0x82, 0xb0, 0x72, 0x6a, 0xf5, 0x0b, 0x7b, 0x88, 0x1f, 0xa1, 0xd9, 0x5b, 0xa0,
-	0xf2, 0xc1, 0x44, 0x62, 0xb7, 0xe4, 0xb7, 0x34, 0xb0, 0xb8, 0xf3, 0x9e, 0x35, 0x6a, 0xe5, 0xaa,
-	0xc1, 0x04, 0xb2, 0x6e, 0xc2, 0xad, 0xe1, 0xe6, 0x19, 0x95, 0xd4, 0x19, 0xc4, 0xd2, 0xa9, 0x4a,
-	0x67, 0x80, 0xe1, 0xa9, 0x2a, 0xcd, 0x08, 0xe3, 0x4e, 0x95, 0x3b, 0x34, 0x55, 0xbf, 0x3a, 0x08,
-	0xa5, 0xa1, 0x75, 0x1f, 0xc3, 0x2b, 0xc3, 0xe0, 0x59, 0x0d, 0xd6, 0x1d, 0x63, 0xe3, 0x24, 0x9e,
-	0x01, 0xd8, 0x74, 0x57, 0xce, 0x20, 0x53, 0x77, 0x56, 0x8d, 0xb7, 0x87, 0xa6, 0xd2, 0x9e, 0x36,
-	0x9c, 0xc9, 0xd2, 0x84, 0xe3, 0x2e, 0x8f, 0x78, 0x43, 0xd2, 0x7c, 0x66, 0xe5, 0xb3, 0x36, 0xb2,
-	0x7c, 0x7e, 0x72, 0x50, 0x55, 0xcf, 0x3b, 0x23, 0x18, 0x2a, 0xa6, 0xa1, 0xb1, 0xa5, 0xef, 0xaa,
-	0x81, 0xb6, 0x4a, 0x96, 0x47, 0x40, 0xf3, 0x65, 0x9f, 0x19, 0x6a, 0x9e, 0x3a, 0xa8, 0x96, 0x0f,
-	0x1b, 0xf8, 0xca, 0xd0, 0x6b, 0x97, 0xc7, 0x91, 0xb1, 0x41, 0xf5, 0x0d, 0xd4, 0xd7, 0xc8, 0xe5,
-	0x51, 0x50, 0x45, 0x16, 0x5c, 0xc3, 0xfd, 0xc6, 0x41, 0xf5, 0xc1, 0x78, 0x82, 0x2f, 0x95, 0x22,
-	0x94, 0xc7, 0x96, 0xbf, 0x91, 0xc3, 0xb7, 0x4d, 0xf4, 0x37, 0xd7, 0xde, 0x18, 0x5a, 0x46, 0xf6,
-	0x20, 0x72, 0xe8, 0x27, 0x3c, 0x94, 0xfe, 0xe3, 0x6c, 0xfa, 0x38, 0xc4, 0x5f, 0x38, 0x68, 0x3a,
-	0x9b, 0x69, 0xf0, 0xc5, 0x52, 0x30, 0x7b, 0xd2, 0x71, 0x2f, 0x94, 0x54, 0x79, 0x5b, 0x27, 0x5b,
-	0x26, 0xf8, 0x0d, 0x7c, 0xfd, 0x5f, 0x05, 0xf7, 0x63, 0xde, 0x96, 0xeb, 0xce, 0xd6, 0x8d, 0x67,
-	0x47, 0x8b, 0xce, 0x6f, 0x47, 0x8b, 0xce, 0x1f, 0x47, 0x8b, 0xce, 0xc7, 0xde, 0xa8, 0xdf, 0xc3,
-	0x93, 0xbf, 0xd1, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x33, 0x77, 0xdc, 0x5b, 0x0f, 0x00,
-	0x00,
+	// 1139 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x6f, 0xdc, 0x44,
+	0x10, 0x67, 0x2f, 0x97, 0xaf, 0x4d, 0x25, 0xd0, 0xd2, 0x86, 0xc3, 0xcd, 0x97, 0xb6, 0x49, 0x1b,
+	0xae, 0xd4, 0x6e, 0x22, 0x24, 0x10, 0xe2, 0x85, 0x90, 0xd2, 0x06, 0x42, 0x15, 0x2e, 0x54, 0x48,
+	0xbc, 0x20, 0xd7, 0x9e, 0x3a, 0x26, 0x77, 0xbb, 0x66, 0x77, 0xef, 0xd0, 0x51, 0xf5, 0x81, 0x3e,
+	0x20, 0x04, 0x48, 0x08, 0x78, 0xe1, 0x8d, 0x8f, 0x47, 0x84, 0xc4, 0xbf, 0xd1, 0x47, 0x24, 0xde,
+	0x2b, 0x14, 0xf1, 0x87, 0xa0, 0x5d, 0xdb, 0xf1, 0x3a, 0x39, 0x3b, 0x45, 0x9c, 0xc4, 0xdb, 0x7a,
+	0x66, 0x76, 0xe6, 0xb7, 0xf3, 0x9b, 0x9b, 0x99, 0xc3, 0xab, 0x12, 0xc4, 0x00, 0x84, 0xe7, 0x27,
+	0x49, 0x37, 0x0e, 0x7c, 0x15, 0x73, 0x66, 0x9f, 0xdd, 0x44, 0x70, 0xc5, 0xc9, 0x9c, 0x25, 0x72,
+	0xce, 0x47, 0x3c, 0xe2, 0x46, 0xee, 0xe9, 0x53, 0x6a, 0xe2, 0x2c, 0x44, 0x9c, 0x47, 0x5d, 0xf0,
+	0xfc, 0x24, 0xf6, 0x7c, 0xc6, 0xb8, 0x32, 0xc6, 0x32, 0xd3, 0xd2, 0xc3, 0x57, 0xa4, 0x1b, 0x73,
+	0xa3, 0x0d, 0xb8, 0x00, 0x6f, 0xb0, 0xe1, 0x45, 0xc0, 0x40, 0xf8, 0x0a, 0xc2, 0xcc, 0xe6, 0xa5,
+	0xc2, 0xa6, 0xe7, 0x07, 0x07, 0x31, 0x03, 0x31, 0xf4, 0x92, 0xc3, 0x48, 0x0b, 0xa4, 0xd7, 0x03,
+	0xe5, 0x8f, 0xba, 0xb5, 0x13, 0xc5, 0xea, 0xa0, 0x7f, 0xd7, 0x0d, 0x78, 0xcf, 0xf3, 0x85, 0x01,
+	0xf6, 0x91, 0x39, 0x5c, 0x0b, 0xc2, 0xe2, 0xb6, 0xfd, 0xbc, 0xc1, 0x86, 0xdf, 0x4d, 0x0e, 0xfc,
+	0xd3, 0xae, 0xb6, 0xea, 0x5c, 0x09, 0x48, 0x78, 0x96, 0x2b, 0x73, 0x8c, 0x15, 0x17, 0x43, 0xeb,
+	0x98, 0xfa, 0xa0, 0x97, 0xf1, 0x33, 0xaf, 0x17, 0xb1, 0xde, 0xed, 0x83, 0x18, 0x12, 0x82, 0x9b,
+	0xcc, 0xef, 0x41, 0x0b, 0xad, 0xa0, 0xf5, 0xd9, 0x8e, 0x39, 0xd3, 0xcf, 0x11, 0x5e, 0xb2, 0x0c,
+	0x3b, 0x20, 0x79, 0x5f, 0x04, 0x70, 0x63, 0x00, 0x4c, 0xc9, 0x93, 0xd7, 0x1a, 0xf9, 0x35, 0xb2,
+	0x8e, 0xcf, 0x89, 0xcc, 0xf4, 0xb6, 0xd6, 0x35, 0xb4, 0x6e, 0xab, 0xf9, 0xe8, 0xf1, 0xf2, 0x53,
+	0x9d, 0x92, 0x86, 0x5c, 0xc6, 0x73, 0xf9, 0xf7, 0x9d, 0x9d, 0xed, 0xd6, 0x84, 0x65, 0x68, 0x2b,
+	0xe8, 0x1e, 0x6e, 0x59, 0x38, 0xde, 0xf1, 0x59, 0x7c, 0x0f, 0xa4, 0xaa, 0x46, 0xb0, 0x82, 0x67,
+	0x04, 0x0c, 0x62, 0x19, 0x73, 0xd6, 0x6a, 0xe8, 0x07, 0x65, 0x4e, 0x8f, 0xa5, 0xf4, 0x02, 0x7e,
+	0xb6, 0xfc, 0xb2, 0x84, 0x33, 0x09, 0xf4, 0x17, 0x54, 0x8a, 0xf4, 0x86, 0x00, 0x5f, 0x41, 0x07,
+	0x3e, 0xee, 0x83, 0x54, 0x84, 0x61, 0xbb, 0xc4, 0x4c, 0xc0, 0xb9, 0xcd, 0x37, 0xdd, 0x82, 0x10,
+	0x37, 0x27, 0xc4, 0x1c, 0x3e, 0x0c, 0x42, 0x37, 0x39, 0x8c, 0x5c, 0xcd, 0xad, 0x6b, 0x97, 0x6b,
+	0xce, 0xad, 0x6b, 0x45, 0xca, 0x5f, 0x6d, 0xd9, 0x91, 0x79, 0x3c, 0xd5, 0x4f, 0x24, 0x08, 0x65,
+	0xde, 0x30, 0xd3, 0xc9, 0xbe, 0xe8, 0x97, 0x65, 0x90, 0x77, 0x92, 0xf0, 0xff, 0x03, 0x49, 0x6f,
+	0x95, 0xb0, 0x6c, 0x43, 0x17, 0x0a, 0x2c, 0xa3, 0xa8, 0x69, 0xe1, 0xe9, 0xc0, 0x97, 0x81, 0x1f,
+	0x42, 0xf6, 0xaa, 0xfc, 0x93, 0x7e, 0x81, 0xf0, 0xbc, 0xe5, 0x6a, 0x7f, 0xc8, 0x82, 0x3a, 0x47,
+	0x65, 0x8e, 0x1b, 0xa7, 0x39, 0x26, 0x0b, 0x78, 0x2a, 0x14, 0xc3, 0x4e, 0x9f, 0x99, 0xc2, 0x9a,
+	0xc9, 0xf4, 0x99, 0x8c, 0x38, 0x78, 0x32, 0x11, 0x7d, 0x06, 0xad, 0xa6, 0xa5, 0x4c, 0x45, 0xf4,
+	0xbb, 0x13, 0x50, 0x12, 0xa8, 0x85, 0x12, 0xe2, 0xa6, 0x4c, 0x20, 0x30, 0x30, 0xe6, 0x36, 0xdf,
+	0x1a, 0x4f, 0xb2, 0x75, 0xd0, 0x0c, 0x95, 0xf1, 0xae, 0x7f, 0x8d, 0x8e, 0x5d, 0xb3, 0xbc, 0xdb,
+	0xbd, 0xeb, 0x07, 0x87, 0x75, 0xc0, 0x1c, 0xdc, 0x88, 0x43, 0x03, 0x6b, 0x62, 0x0b, 0x6b, 0x57,
+	0x47, 0x8f, 0x97, 0x1b, 0x3b, 0xdb, 0x9d, 0x46, 0x1c, 0xfe, 0x87, 0xec, 0xbc, 0x8d, 0x2f, 0x9e,
+	0xa2, 0x7c, 0x8f, 0x87, 0x67, 0xb0, 0x9e, 0xf0, 0xb0, 0xe8, 0x06, 0x9d, 0xfc, 0x93, 0xfe, 0xdc,
+	0xc0, 0xcf, 0x59, 0xde, 0xf6, 0x78, 0xb8, 0xcb, 0xa3, 0x9a, 0xe6, 0x52, 0xe9, 0x89, 0x50, 0x3c,
+	0x1b, 0x70, 0xa6, 0x7c, 0xdd, 0x93, 0x4b, 0xad, 0xa4, 0x10, 0xeb, 0xd6, 0x24, 0x63, 0x16, 0xc0,
+	0x3e, 0x04, 0x9c, 0x85, 0xd2, 0xbc, 0x6e, 0x22, 0x6f, 0x4d, 0xb6, 0x86, 0xdc, 0xc2, 0xb3, 0xe6,
+	0xfb, 0xbd, 0xb8, 0x07, 0xad, 0xc9, 0x15, 0xb4, 0x3e, 0xb7, 0xd9, 0x76, 0xd3, 0xe6, 0xef, 0xda,
+	0xcd, 0xbf, 0x20, 0x54, 0x37, 0x7f, 0x77, 0xb0, 0xe1, 0xea, 0x1b, 0x9d, 0xe2, 0xb2, 0xc6, 0xa5,
+	0xfc, 0xb8, 0xbb, 0x1b, 0x33, 0x90, 0xad, 0x29, 0x2b, 0x60, 0x21, 0xd6, 0x64, 0xdc, 0xe3, 0xdd,
+	0x2e, 0xff, 0xa4, 0x35, 0x6d, 0x93, 0x91, 0xca, 0xe8, 0xa7, 0x78, 0x66, 0x97, 0x47, 0x37, 0x98,
+	0x12, 0x43, 0xb2, 0x84, 0xa7, 0xf5, 0x73, 0x80, 0xa9, 0x34, 0x2d, 0x99, 0x69, 0x2e, 0x24, 0xb7,
+	0xf1, 0xac, 0x8a, 0x7b, 0xb0, 0xaf, 0xfc, 0x5e, 0x92, 0x15, 0xe4, 0xbf, 0xc0, 0x7d, 0x8c, 0x2c,
+	0x77, 0xb1, 0xf9, 0xfb, 0xd3, 0x98, 0xd8, 0x55, 0x09, 0x62, 0x10, 0x07, 0x40, 0xbe, 0x41, 0xb8,
+	0xb9, 0x1b, 0x4b, 0x45, 0x16, 0x4b, 0x85, 0x7c, 0x72, 0xac, 0x38, 0x63, 0xfa, 0x31, 0xe8, 0x50,
+	0x74, 0xe1, 0xe1, 0x9f, 0x7f, 0x7f, 0xdf, 0x98, 0x27, 0xe7, 0xcd, 0x84, 0x1e, 0x6c, 0xd8, 0x03,
+	0x53, 0x92, 0xaf, 0x11, 0x26, 0xda, 0xac, 0x3c, 0xa5, 0xc8, 0xd5, 0x2a, 0x7c, 0x23, 0xa6, 0x99,
+	0xb3, 0x68, 0x65, 0xca, 0xd5, 0x2b, 0x80, 0xce, 0x8b, 0x31, 0x30, 0x00, 0xda, 0x06, 0xc0, 0x2a,
+	0xa1, 0xa3, 0x00, 0x78, 0xf7, 0x75, 0x7d, 0x3e, 0xf0, 0x20, 0x8d, 0xfb, 0x23, 0xc2, 0x93, 0xef,
+	0xfb, 0x2a, 0x38, 0x38, 0x2b, 0x43, 0x7b, 0xe3, 0xc9, 0x90, 0x89, 0x65, 0xa0, 0xd2, 0x4b, 0x06,
+	0xe6, 0x22, 0xb9, 0x98, 0xc3, 0x94, 0x4a, 0x80, 0xdf, 0x2b, 0xa1, 0xbd, 0x8e, 0xc8, 0x0f, 0x08,
+	0x4f, 0xa5, 0x03, 0x8e, 0xac, 0x55, 0x41, 0x2c, 0x0d, 0x40, 0x67, 0x4c, 0x63, 0x84, 0x2e, 0x1b,
+	0x80, 0xcf, 0xd3, 0x91, 0x44, 0xbe, 0x8a, 0xda, 0xe4, 0x5b, 0x84, 0x27, 0x6e, 0xc2, 0x99, 0xc5,
+	0x35, 0x2e, 0x3c, 0xa7, 0x12, 0x36, 0x82, 0x57, 0xf2, 0x10, 0xe1, 0x73, 0x37, 0x41, 0xe5, 0xcb,
+	0x87, 0xac, 0x4e, 0x5a, 0x69, 0x3f, 0x71, 0x16, 0x5c, 0x6b, 0xff, 0xca, 0x55, 0xc7, 0x0b, 0xc7,
+	0x35, 0x13, 0xfa, 0x0a, 0x59, 0xab, 0x2b, 0xa9, 0xde, 0x71, 0x4c, 0xcd, 0x59, 0x3a, 0xef, 0xab,
+	0xc3, 0x97, 0xf6, 0x81, 0x71, 0x73, 0xe6, 0x54, 0x72, 0xf6, 0x2b, 0xc2, 0x38, 0x0d, 0xad, 0x27,
+	0x17, 0xb9, 0x54, 0x05, 0xcf, 0x1a, 0xa6, 0xce, 0x18, 0x47, 0x25, 0xbd, 0x6a, 0x00, 0xae, 0x39,
+	0x2b, 0x75, 0x99, 0xd4, 0x83, 0x54, 0x83, 0x1d, 0xe0, 0xa9, 0x74, 0x6e, 0x55, 0xa7, 0xb1, 0xb4,
+	0xca, 0x38, 0x2b, 0x35, 0x6d, 0x24, 0x65, 0x32, 0x2b, 0xa2, 0x76, 0x6d, 0x11, 0xfd, 0x84, 0x70,
+	0x53, 0x2f, 0x36, 0x35, 0xe9, 0x29, 0xd6, 0x9e, 0xb1, 0x71, 0x97, 0xa5, 0x86, 0xd6, 0xa7, 0x66,
+	0xc8, 0x4c, 0x6a, 0x7e, 0x43, 0x78, 0x26, 0xdf, 0x2d, 0xc8, 0x95, 0xca, 0x67, 0x97, 0xb7, 0x8f,
+	0xb1, 0x41, 0xf5, 0x0c, 0xd4, 0x17, 0xe8, 0x6a, 0x1d, 0x54, 0x91, 0x05, 0xd7, 0x70, 0xbf, 0x42,
+	0x78, 0xf6, 0x78, 0x05, 0x21, 0xeb, 0xf5, 0x6c, 0x16, 0x5b, 0xca, 0x13, 0x10, 0xba, 0x69, 0xa0,
+	0xbc, 0xd8, 0x6e, 0xd7, 0x41, 0x49, 0x78, 0x28, 0xbd, 0xfb, 0xd9, 0x0a, 0xf2, 0x80, 0x7c, 0x86,
+	0xf0, 0x74, 0xb6, 0xc2, 0x90, 0xd5, 0xaa, 0x08, 0xf6, 0x8e, 0xe3, 0x5c, 0x28, 0x59, 0xe5, 0x63,
+	0x9e, 0xbe, 0x6c, 0x82, 0x6f, 0x10, 0xef, 0xc9, 0x83, 0x7b, 0x5d, 0x1e, 0xc9, 0xeb, 0x68, 0xeb,
+	0xb5, 0x47, 0x47, 0x4b, 0xe8, 0x8f, 0xa3, 0x25, 0xf4, 0xd7, 0xd1, 0x12, 0xfa, 0xc0, 0xad, 0xfb,
+	0xbf, 0x78, 0xfa, 0x7f, 0xf5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x12, 0x3c, 0xa1, 0x11, 0x6c,
+	0x0f, 0x00, 0x00,
 }
diff --git a/server/application/application.pb.gw.go b/server/application/application.pb.gw.go
index 791564e40c270..9dc3b6d023bc0 100644
--- a/server/application/application.pb.gw.go
+++ b/server/application/application.pb.gw.go
@@ -46,7 +46,7 @@ func request_ApplicationService_List_0(ctx context.Context, marshaler runtime.Ma
 }
 
 var (
-	filter_ApplicationService_ListResourceEvents_0 = &utilities.DoubleArray{Encoding: map[string]int{"appName": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+	filter_ApplicationService_ListResourceEvents_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
 
 func request_ApplicationService_ListResourceEvents_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -60,15 +60,15 @@ func request_ApplicationService_ListResourceEvents_0(ctx context.Context, marsha
 		_   = err
 	)
 
-	val, ok = pathParams["appName"]
+	val, ok = pathParams["name"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "appName")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
 
-	protoReq.AppName, err = runtime.StringP(val)
+	protoReq.Name, err = runtime.StringP(val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "appName", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
 
 	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ApplicationService_ListResourceEvents_0); err != nil {
@@ -109,7 +109,7 @@ func request_ApplicationService_Create_0(ctx context.Context, marshaler runtime.
 	var protoReq ApplicationCreateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -146,11 +146,11 @@ func request_ApplicationService_Get_0(ctx context.Context, marshaler runtime.Mar
 }
 
 var (
-	filter_ApplicationService_GetManifests_0 = &utilities.DoubleArray{Encoding: map[string]int{"appName": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+	filter_ApplicationService_GetManifests_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
 
 func request_ApplicationService_GetManifests_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ManifestQuery
+	var protoReq ApplicationManifestQuery
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -160,15 +160,15 @@ func request_ApplicationService_GetManifests_0(ctx context.Context, marshaler ru
 		_   = err
 	)
 
-	val, ok = pathParams["appName"]
+	val, ok = pathParams["name"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "appName")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
 
-	protoReq.AppName, err = runtime.StringP(val)
+	protoReq.Name, err = runtime.StringP(val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "appName", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
 
 	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ApplicationService_GetManifests_0); err != nil {
@@ -184,7 +184,7 @@ func request_ApplicationService_Update_0(ctx context.Context, marshaler runtime.
 	var protoReq ApplicationUpdateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -197,7 +197,7 @@ func request_ApplicationService_UpdateSpec_0(ctx context.Context, marshaler runt
 	var protoReq ApplicationSpecRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -208,15 +208,15 @@ func request_ApplicationService_UpdateSpec_0(ctx context.Context, marshaler runt
 		_   = err
 	)
 
-	val, ok = pathParams["appName"]
+	val, ok = pathParams["name"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "appName")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
 
-	protoReq.AppName, err = runtime.StringP(val)
+	protoReq.Name, err = runtime.StringP(val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "appName", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
 
 	msg, err := client.UpdateSpec(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
@@ -263,7 +263,7 @@ func request_ApplicationService_Sync_0(ctx context.Context, marshaler runtime.Ma
 	var protoReq ApplicationSyncRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -294,7 +294,7 @@ func request_ApplicationService_Rollback_0(ctx context.Context, marshaler runtim
 	var protoReq ApplicationRollbackRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -322,7 +322,7 @@ func request_ApplicationService_Rollback_0(ctx context.Context, marshaler runtim
 }
 
 func request_ApplicationService_DeletePod_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq DeletePodQuery
+	var protoReq ApplicationDeletePodRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -332,15 +332,15 @@ func request_ApplicationService_DeletePod_0(ctx context.Context, marshaler runti
 		_   = err
 	)
 
-	val, ok = pathParams["applicationName"]
+	val, ok = pathParams["name"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "applicationName")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
 
-	protoReq.ApplicationName, err = runtime.StringP(val)
+	protoReq.Name, err = runtime.StringP(val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "applicationName", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
 
 	val, ok = pathParams["podName"]
@@ -360,11 +360,11 @@ func request_ApplicationService_DeletePod_0(ctx context.Context, marshaler runti
 }
 
 var (
-	filter_ApplicationService_PodLogs_0 = &utilities.DoubleArray{Encoding: map[string]int{"applicationName": 0, "podName": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
+	filter_ApplicationService_PodLogs_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0, "podName": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
 )
 
 func request_ApplicationService_PodLogs_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (ApplicationService_PodLogsClient, runtime.ServerMetadata, error) {
-	var protoReq PodLogsQuery
+	var protoReq ApplicationPodLogsQuery
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -374,15 +374,15 @@ func request_ApplicationService_PodLogs_0(ctx context.Context, marshaler runtime
 		_   = err
 	)
 
-	val, ok = pathParams["applicationName"]
+	val, ok = pathParams["name"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "applicationName")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
 
-	protoReq.ApplicationName, err = runtime.StringP(val)
+	protoReq.Name, err = runtime.StringP(val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "applicationName", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
 
 	val, ok = pathParams["podName"]
@@ -834,7 +834,7 @@ func RegisterApplicationServiceHandlerClient(ctx context.Context, mux *runtime.S
 var (
 	pattern_ApplicationService_List_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "applications"}, ""))
 
-	pattern_ApplicationService_ListResourceEvents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "appName", "events"}, ""))
+	pattern_ApplicationService_ListResourceEvents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "events"}, ""))
 
 	pattern_ApplicationService_Watch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "stream", "applications"}, ""))
 
@@ -842,11 +842,11 @@ var (
 
 	pattern_ApplicationService_Get_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "applications", "name"}, ""))
 
-	pattern_ApplicationService_GetManifests_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "appName", "manifests"}, ""))
+	pattern_ApplicationService_GetManifests_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "manifests"}, ""))
 
 	pattern_ApplicationService_Update_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "applications"}, ""))
 
-	pattern_ApplicationService_UpdateSpec_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "appName", "spec"}, ""))
+	pattern_ApplicationService_UpdateSpec_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "spec"}, ""))
 
 	pattern_ApplicationService_Delete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "applications", "name"}, ""))
 
@@ -854,9 +854,9 @@ var (
 
 	pattern_ApplicationService_Rollback_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "rollback"}, ""))
 
-	pattern_ApplicationService_DeletePod_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"api", "v1", "applications", "applicationName", "pods", "podName"}, ""))
+	pattern_ApplicationService_DeletePod_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"api", "v1", "applications", "name", "pods", "podName"}, ""))
 
-	pattern_ApplicationService_PodLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "applications", "applicationName", "pods", "podName", "logs"}, ""))
+	pattern_ApplicationService_PodLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "applications", "name", "pods", "podName", "logs"}, ""))
 )
 
 var (
diff --git a/server/application/application.proto b/server/application/application.proto
index f5affe011dd39..ee5db99ad11f2 100644
--- a/server/application/application.proto
+++ b/server/application/application.proto
@@ -21,22 +21,22 @@ message ApplicationQuery {
 
 // ApplicationEventsQuery is a query for application resource events
 message ApplicationResourceEventsQuery {
-	required string appName = 1;
-	required string resName = 2;
-	required string resUid = 3;
+	required string name = 1;
+	required string resourceName = 2 [(gogoproto.nullable) = false];
+	required string resourceUID = 3 [(gogoproto.nullable) = false];
 }
 
 // ManifestQuery is a query for manifest resources
-message ManifestQuery {
-	required string appName = 1;
-	optional string revision = 2;
+message ApplicationManifestQuery {
+	required string name = 1;
+	optional string revision = 2 [(gogoproto.nullable) = false];
 }
 
 message ApplicationResponse {}
 
 message ApplicationCreateRequest {
 	required github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application application = 1 [(gogoproto.nullable) = false];
-	required bool upsert = 2;
+	optional bool upsert = 2;
 }
 
 message ApplicationUpdateRequest {
@@ -58,7 +58,7 @@ message ApplicationSyncRequest {
 
 // ApplicationSpecRequest is a request to update application spec
 message ApplicationSpecRequest {
-	required string appName = 1;
+	required string name = 1;
 	required github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSpec spec = 2 [(gogoproto.nullable) = false];
 }
 
@@ -69,13 +69,13 @@ message ApplicationRollbackRequest {
 	required bool prune = 4 [(gogoproto.nullable) = false];
 }
 
-message DeletePodQuery {
-	required string applicationName = 1;
+message ApplicationDeletePodRequest {
+	required string name = 1;
 	required string podName = 2;
 }
 
-message PodLogsQuery {
-	required string applicationName = 1;
+message ApplicationPodLogsQuery {
+	required string name = 1;
 	required string podName = 2;
 	required string container = 3 [(gogoproto.nullable) = false];
 	required int64 sinceSeconds = 4 [(gogoproto.nullable) = false];
@@ -99,7 +99,7 @@ service ApplicationService {
 
 	// ListResourceEvents returns a list of event resources
 	rpc ListResourceEvents(ApplicationResourceEventsQuery) returns (k8s.io.api.core.v1.EventList) {
-		option (google.api.http).get = "/api/v1/applications/{appName}/events";
+		option (google.api.http).get = "/api/v1/applications/{name}/events";
 	}
 
 	// Watch returns stream of application change events.
@@ -121,8 +121,8 @@ service ApplicationService {
 	}
 
 	// GetManifests returns application manifests
-	rpc GetManifests(ManifestQuery) returns (repository.ManifestResponse) {
-		option (google.api.http).get = "/api/v1/applications/{appName}/manifests";
+	rpc GetManifests(ApplicationManifestQuery) returns (repository.ManifestResponse) {
+		option (google.api.http).get = "/api/v1/applications/{name}/manifests";
 	}
 
 	// Update updates an application
@@ -136,7 +136,7 @@ service ApplicationService {
 	// Update updates an application spec
 	rpc UpdateSpec(ApplicationSpecRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSpec) {
 		option (google.api.http) = {
-			put: "/api/v1/applications/{appName}/spec"
+			put: "/api/v1/applications/{name}/spec"
 			body: "*"
 		};
 	}
@@ -163,12 +163,12 @@ service ApplicationService {
 	}
 
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	rpc DeletePod(DeletePodQuery) returns (ApplicationResponse) {
-		option (google.api.http).delete = "/api/v1/applications/{applicationName}/pods/{podName}";
+	rpc DeletePod(ApplicationDeletePodRequest) returns (ApplicationResponse) {
+		option (google.api.http).delete = "/api/v1/applications/{name}/pods/{podName}";
 	}
 
 	// PodLogs returns stream of log entries for the specified pod. Pod
-	rpc PodLogs(PodLogsQuery) returns (stream LogEntry) {
-		option (google.api.http).get = "/api/v1/applications/{applicationName}/pods/{podName}/logs";
+	rpc PodLogs(ApplicationPodLogsQuery) returns (stream LogEntry) {
+		option (google.api.http).get = "/api/v1/applications/{name}/pods/{podName}/logs";
 	}
 }
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
index 2ec314be8720b..e4c88376f6ae2 100644
--- a/server/cluster/cluster.go
+++ b/server/cluster/cluster.go
@@ -48,11 +48,6 @@ func (s *Server) Update(ctx context.Context, q *ClusterUpdateRequest) (*appv1.Cl
 	return redact(clust), err
 }
 
-// UpdateREST updates a cluster (special handler intended to be used only by the gRPC gateway)
-func (s *Server) UpdateREST(ctx context.Context, r *ClusterRESTUpdateRequest) (*appv1.Cluster, error) {
-	return s.Update(ctx, &ClusterUpdateRequest{Cluster: r.Cluster})
-}
-
 // Delete deletes a cluster by name
 func (s *Server) Delete(ctx context.Context, q *ClusterQuery) (*ClusterResponse, error) {
 	err := s.db.DeleteCluster(ctx, q.Server)
diff --git a/server/cluster/cluster.pb.go b/server/cluster/cluster.pb.go
index ff089d96b7fc7..7bc840934974a 100644
--- a/server/cluster/cluster.pb.go
+++ b/server/cluster/cluster.pb.go
@@ -16,7 +16,6 @@
 		ClusterResponse
 		ClusterCreateRequest
 		ClusterUpdateRequest
-		ClusterRESTUpdateRequest
 */
 package cluster
 
@@ -101,36 +100,11 @@ func (m *ClusterUpdateRequest) GetCluster() *github_com_argoproj_argo_cd_pkg_api
 	return nil
 }
 
-type ClusterRESTUpdateRequest struct {
-	Server  string                                                             `protobuf:"bytes,1,opt,name=server,proto3" json:"server,omitempty"`
-	Cluster *github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster `protobuf:"bytes,2,opt,name=cluster" json:"cluster,omitempty"`
-}
-
-func (m *ClusterRESTUpdateRequest) Reset()                    { *m = ClusterRESTUpdateRequest{} }
-func (m *ClusterRESTUpdateRequest) String() string            { return proto.CompactTextString(m) }
-func (*ClusterRESTUpdateRequest) ProtoMessage()               {}
-func (*ClusterRESTUpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptorCluster, []int{4} }
-
-func (m *ClusterRESTUpdateRequest) GetServer() string {
-	if m != nil {
-		return m.Server
-	}
-	return ""
-}
-
-func (m *ClusterRESTUpdateRequest) GetCluster() *github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster {
-	if m != nil {
-		return m.Cluster
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*ClusterQuery)(nil), "cluster.ClusterQuery")
 	proto.RegisterType((*ClusterResponse)(nil), "cluster.ClusterResponse")
 	proto.RegisterType((*ClusterCreateRequest)(nil), "cluster.ClusterCreateRequest")
 	proto.RegisterType((*ClusterUpdateRequest)(nil), "cluster.ClusterUpdateRequest")
-	proto.RegisterType((*ClusterRESTUpdateRequest)(nil), "cluster.ClusterRESTUpdateRequest")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -152,8 +126,6 @@ type ClusterServiceClient interface {
 	Get(ctx context.Context, in *ClusterQuery, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
 	// Update updates a cluster
 	Update(ctx context.Context, in *ClusterUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
-	// Update updates a cluster (special handler intended to be used only by the gRPC gateway)
-	UpdateREST(ctx context.Context, in *ClusterRESTUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
 	// Delete updates a cluster
 	Delete(ctx context.Context, in *ClusterQuery, opts ...grpc.CallOption) (*ClusterResponse, error)
 }
@@ -202,15 +174,6 @@ func (c *clusterServiceClient) Update(ctx context.Context, in *ClusterUpdateRequ
 	return out, nil
 }
 
-func (c *clusterServiceClient) UpdateREST(ctx context.Context, in *ClusterRESTUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error) {
-	out := new(github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster)
-	err := grpc.Invoke(ctx, "/cluster.ClusterService/UpdateREST", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *clusterServiceClient) Delete(ctx context.Context, in *ClusterQuery, opts ...grpc.CallOption) (*ClusterResponse, error) {
 	out := new(ClusterResponse)
 	err := grpc.Invoke(ctx, "/cluster.ClusterService/Delete", in, out, c.cc, opts...)
@@ -231,8 +194,6 @@ type ClusterServiceServer interface {
 	Get(context.Context, *ClusterQuery) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
 	// Update updates a cluster
 	Update(context.Context, *ClusterUpdateRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
-	// Update updates a cluster (special handler intended to be used only by the gRPC gateway)
-	UpdateREST(context.Context, *ClusterRESTUpdateRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster, error)
 	// Delete updates a cluster
 	Delete(context.Context, *ClusterQuery) (*ClusterResponse, error)
 }
@@ -313,24 +274,6 @@ func _ClusterService_Update_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ClusterService_UpdateREST_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ClusterRESTUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ClusterServiceServer).UpdateREST(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cluster.ClusterService/UpdateREST",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ClusterServiceServer).UpdateREST(ctx, req.(*ClusterRESTUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _ClusterService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ClusterQuery)
 	if err := dec(in); err != nil {
@@ -369,10 +312,6 @@ var _ClusterService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "Update",
 			Handler:    _ClusterService_Update_Handler,
 		},
-		{
-			MethodName: "UpdateREST",
-			Handler:    _ClusterService_UpdateREST_Handler,
-		},
 		{
 			MethodName: "Delete",
 			Handler:    _ClusterService_Delete_Handler,
@@ -480,40 +419,6 @@ func (m *ClusterUpdateRequest) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
-func (m *ClusterRESTUpdateRequest) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ClusterRESTUpdateRequest) MarshalTo(dAtA []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	if len(m.Server) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintCluster(dAtA, i, uint64(len(m.Server)))
-		i += copy(dAtA[i:], m.Server)
-	}
-	if m.Cluster != nil {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintCluster(dAtA, i, uint64(m.Cluster.Size()))
-		n3, err := m.Cluster.MarshalTo(dAtA[i:])
-		if err != nil {
-			return 0, err
-		}
-		i += n3
-	}
-	return i, nil
-}
-
 func encodeVarintCluster(dAtA []byte, offset int, v uint64) int {
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -559,20 +464,6 @@ func (m *ClusterUpdateRequest) Size() (n int) {
 	return n
 }
 
-func (m *ClusterRESTUpdateRequest) Size() (n int) {
-	var l int
-	_ = l
-	l = len(m.Server)
-	if l > 0 {
-		n += 1 + l + sovCluster(uint64(l))
-	}
-	if m.Cluster != nil {
-		l = m.Cluster.Size()
-		n += 1 + l + sovCluster(uint64(l))
-	}
-	return n
-}
-
 func sovCluster(x uint64) (n int) {
 	for {
 		n++
@@ -881,118 +772,6 @@ func (m *ClusterUpdateRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ClusterRESTUpdateRequest) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowCluster
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: ClusterRESTUpdateRequest: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ClusterRESTUpdateRequest: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Server", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCluster
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthCluster
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Server = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Cluster", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCluster
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthCluster
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Cluster == nil {
-				m.Cluster = &github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Cluster{}
-			}
-			if err := m.Cluster.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipCluster(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthCluster
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func skipCluster(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
@@ -1101,36 +880,34 @@ var (
 func init() { proto.RegisterFile("server/cluster/cluster.proto", fileDescriptorCluster) }
 
 var fileDescriptorCluster = []byte{
-	// 490 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6b, 0x14, 0x31,
-	0x18, 0xc6, 0x4d, 0x95, 0x11, 0xa3, 0xf8, 0x27, 0xb4, 0xb2, 0x4e, 0xeb, 0x62, 0x07, 0x11, 0x59,
-	0x30, 0x61, 0xeb, 0xa5, 0xf4, 0xd8, 0x5a, 0x45, 0xf0, 0xe2, 0x6e, 0xbd, 0x48, 0x41, 0xd2, 0xd9,
-	0x97, 0x74, 0xdc, 0xe9, 0x24, 0x26, 0xd9, 0x01, 0x11, 0x11, 0xf4, 0xe2, 0x51, 0xf1, 0x03, 0xf8,
-	0x75, 0x3c, 0x0a, 0x7e, 0x01, 0x59, 0xfc, 0x20, 0xb2, 0x99, 0x84, 0xee, 0xee, 0x30, 0x5e, 0x1c,
-	0x7a, 0xda, 0xe4, 0x4d, 0xf6, 0x7d, 0x7e, 0xf3, 0xe4, 0xe1, 0xc5, 0x1b, 0x06, 0x74, 0x09, 0x9a,
-	0xa5, 0xf9, 0xc4, 0xd8, 0xd3, 0x5f, 0xaa, 0xb4, 0xb4, 0x92, 0x5c, 0xf4, 0xdb, 0x78, 0x55, 0x48,
-	0x21, 0x5d, 0x8d, 0xcd, 0x56, 0xd5, 0x71, 0xbc, 0x21, 0xa4, 0x14, 0x39, 0x30, 0xae, 0x32, 0xc6,
-	0x8b, 0x42, 0x5a, 0x6e, 0x33, 0x59, 0x18, 0x7f, 0x9a, 0x8c, 0xb7, 0x0d, 0xcd, 0xa4, 0x3b, 0x4d,
-	0xa5, 0x06, 0x56, 0xf6, 0x99, 0x80, 0x02, 0x34, 0xb7, 0x30, 0xf2, 0x77, 0x9e, 0x8a, 0xcc, 0x1e,
-	0x4f, 0x8e, 0x68, 0x2a, 0x4f, 0x18, 0xd7, 0x4e, 0xe2, 0xb5, 0x5b, 0x3c, 0x48, 0x47, 0x4c, 0x8d,
-	0xc5, 0xec, 0xcf, 0x86, 0x71, 0xa5, 0xf2, 0x2c, 0x75, 0xcd, 0x59, 0xd9, 0xe7, 0xb9, 0x3a, 0xe6,
-	0xb5, 0x56, 0xc9, 0x3d, 0x7c, 0x65, 0xaf, 0xa2, 0x7d, 0x3e, 0x01, 0xfd, 0x96, 0xdc, 0xc4, 0x51,
-	0xf5, 0x6d, 0x1d, 0x74, 0x07, 0xdd, 0xbf, 0x34, 0xf0, 0xbb, 0xe4, 0x06, 0xbe, 0xe6, 0xef, 0x0d,
-	0xc0, 0x28, 0x59, 0x18, 0x48, 0x2c, 0x5e, 0xf5, 0xa5, 0x3d, 0x0d, 0xdc, 0xc2, 0x00, 0xde, 0x4c,
-	0xc0, 0x58, 0x72, 0x88, 0x83, 0x01, 0xae, 0xc7, 0xe5, 0xad, 0x5d, 0x7a, 0xca, 0x4b, 0x03, 0xaf,
-	0x5b, 0xbc, 0x4a, 0x47, 0x54, 0x8d, 0x05, 0x9d, 0xf1, 0xd2, 0x39, 0x5e, 0x1a, 0x78, 0x69, 0x10,
-	0x0d, 0x2d, 0xe7, 0x54, 0x5f, 0xa8, 0xd1, 0x99, 0xa9, 0x7e, 0x41, 0xb8, 0x13, 0x8a, 0xfb, 0xc3,
-	0x83, 0x45, 0xe9, 0x06, 0xcf, 0xe6, 0x91, 0x56, 0x5a, 0x47, 0xda, 0xfa, 0x1a, 0xe1, 0xab, 0xbe,
-	0x38, 0x04, 0x5d, 0x66, 0x29, 0x90, 0x0f, 0xf8, 0xc2, 0xb3, 0xcc, 0x58, 0xb2, 0x46, 0x43, 0x20,
-	0xe7, 0xdf, 0x36, 0x7e, 0xfc, 0xff, 0xf2, 0xb3, 0xf6, 0x49, 0xe7, 0xe3, 0xaf, 0x3f, 0xdf, 0x56,
-	0x08, 0xb9, 0xee, 0x42, 0x5a, 0xf6, 0x43, 0xfc, 0x0d, 0xf9, 0x8c, 0x70, 0x54, 0x85, 0x81, 0xdc,
-	0x5e, 0x66, 0x58, 0x08, 0x49, 0xdc, 0x82, 0x15, 0xc9, 0xba, 0xe3, 0x58, 0x4b, 0x6a, 0x1c, 0x3b,
-	0xa8, 0x47, 0x3e, 0x21, 0x7c, 0xfe, 0x09, 0x34, 0x7a, 0xd1, 0x86, 0xfe, 0xa6, 0xd3, 0x5f, 0x27,
-	0xb7, 0x96, 0xf5, 0xd9, 0xbb, 0x2a, 0x01, 0xef, 0xc9, 0x09, 0x8e, 0xaa, 0xac, 0xd4, 0xfd, 0x58,
-	0xc8, 0x50, 0x2b, 0x3c, 0xe7, 0xc8, 0x77, 0x84, 0xb1, 0xef, 0xbb, 0x3f, 0x3c, 0x20, 0x9b, 0xcb,
-	0x9a, 0xb5, 0xec, 0xb6, 0xa2, 0xdb, 0x73, 0x3e, 0xdc, 0x8d, 0x9b, 0x7d, 0xd8, 0x09, 0xa9, 0x25,
-	0x87, 0x38, 0x7a, 0x04, 0x39, 0x58, 0x68, 0x7a, 0x98, 0x4e, 0x8d, 0x39, 0xcc, 0x1b, 0x6f, 0x77,
-	0xaf, 0x59, 0x66, 0x77, 0xfb, 0xc7, 0xb4, 0x8b, 0x7e, 0x4e, 0xbb, 0xe8, 0xf7, 0xb4, 0x8b, 0x5e,
-	0xf6, 0xfe, 0x35, 0x26, 0x17, 0x27, 0xf8, 0x51, 0xe4, 0xc6, 0xe1, 0xc3, 0xbf, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x60, 0x65, 0x09, 0x67, 0xda, 0x05, 0x00, 0x00,
+	// 457 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcd, 0x8a, 0x14, 0x31,
+	0x10, 0xc7, 0x89, 0x1f, 0x2d, 0x46, 0xf1, 0x23, 0xec, 0xca, 0xd8, 0xbb, 0x0e, 0x6e, 0x1f, 0x16,
+	0x19, 0x34, 0x61, 0xd6, 0xcb, 0xe2, 0x71, 0x57, 0x14, 0xc1, 0x8b, 0x23, 0x5e, 0x64, 0x41, 0x32,
+	0xdd, 0x45, 0xa6, 0x9d, 0xb6, 0x13, 0x93, 0x74, 0x83, 0x88, 0x08, 0x7a, 0xf1, 0xee, 0x49, 0xf0,
+	0x81, 0x3c, 0x0a, 0xbe, 0x80, 0x0c, 0x3e, 0x88, 0x74, 0x3a, 0x71, 0x3e, 0x9a, 0xf1, 0xe2, 0xe0,
+	0x69, 0x92, 0x4a, 0xa6, 0xfe, 0xbf, 0xfa, 0xa7, 0xba, 0xf0, 0xae, 0x01, 0x5d, 0x83, 0x66, 0x69,
+	0x51, 0x19, 0x3b, 0xff, 0xa5, 0x4a, 0x4b, 0x2b, 0xc9, 0x39, 0xbf, 0x8d, 0xb7, 0x84, 0x14, 0xd2,
+	0xc5, 0x58, 0xb3, 0x6a, 0x8f, 0xe3, 0x5d, 0x21, 0xa5, 0x28, 0x80, 0x71, 0x95, 0x33, 0x5e, 0x96,
+	0xd2, 0x72, 0x9b, 0xcb, 0xd2, 0xf8, 0xd3, 0x64, 0x7a, 0x68, 0x68, 0x2e, 0xdd, 0x69, 0x2a, 0x35,
+	0xb0, 0x7a, 0xc8, 0x04, 0x94, 0xa0, 0xb9, 0x85, 0xcc, 0xdf, 0x79, 0x24, 0x72, 0x3b, 0xa9, 0xc6,
+	0x34, 0x95, 0xaf, 0x18, 0xd7, 0x4e, 0xe2, 0xa5, 0x5b, 0xdc, 0x49, 0x33, 0xa6, 0xa6, 0xa2, 0xf9,
+	0xb3, 0x61, 0x5c, 0xa9, 0x22, 0x4f, 0x5d, 0x72, 0x56, 0x0f, 0x79, 0xa1, 0x26, 0xbc, 0x93, 0x2a,
+	0xd9, 0xc7, 0x17, 0x8f, 0x5b, 0xda, 0x27, 0x15, 0xe8, 0x37, 0xe4, 0x1a, 0x8e, 0xda, 0xda, 0x7a,
+	0xe8, 0x26, 0xba, 0x75, 0x7e, 0xe4, 0x77, 0xc9, 0x55, 0x7c, 0xd9, 0xdf, 0x1b, 0x81, 0x51, 0xb2,
+	0x34, 0x90, 0x58, 0xbc, 0xe5, 0x43, 0xc7, 0x1a, 0xb8, 0x85, 0x11, 0xbc, 0xae, 0xc0, 0x58, 0x72,
+	0x82, 0x83, 0x01, 0x2e, 0xc7, 0x85, 0x83, 0x23, 0x3a, 0xe7, 0xa5, 0x81, 0xd7, 0x2d, 0x5e, 0xa4,
+	0x19, 0x55, 0x53, 0x41, 0x1b, 0x5e, 0xba, 0xc0, 0x4b, 0x03, 0x2f, 0x0d, 0xa2, 0x21, 0xe5, 0x82,
+	0xea, 0x33, 0x95, 0xfd, 0x2f, 0xd5, 0x83, 0xaf, 0x67, 0xf1, 0x25, 0x1f, 0x7c, 0x0a, 0xba, 0xce,
+	0x53, 0x20, 0xef, 0xf1, 0x99, 0xc7, 0xb9, 0xb1, 0x64, 0x9b, 0x86, 0xd7, 0x5f, 0x34, 0x32, 0x7e,
+	0xf0, 0xef, 0xf2, 0x4d, 0xfa, 0xa4, 0xf7, 0xe1, 0xc7, 0xaf, 0xcf, 0xa7, 0x08, 0xb9, 0xe2, 0x3a,
+	0xa2, 0x1e, 0x86, 0x5e, 0x33, 0xe4, 0x13, 0xc2, 0x51, 0xeb, 0x3c, 0xb9, 0xb1, 0xca, 0xb0, 0xf4,
+	0x22, 0xf1, 0x06, 0xac, 0x48, 0x76, 0x1c, 0xc7, 0x76, 0xd2, 0xe1, 0xb8, 0x87, 0x06, 0xe4, 0x23,
+	0xc2, 0xa7, 0x1f, 0xc2, 0x5a, 0x2f, 0x36, 0xa1, 0xbf, 0xe7, 0xf4, 0x77, 0xc8, 0xf5, 0x55, 0x7d,
+	0xf6, 0xb6, 0x6d, 0xd1, 0x77, 0xe4, 0x0b, 0xc2, 0x51, 0xdb, 0x14, 0x5d, 0x43, 0x96, 0x9a, 0x65,
+	0x23, 0x40, 0xb7, 0x1d, 0xd0, 0x7e, 0xbc, 0xd7, 0x05, 0x0a, 0xda, 0x1e, 0xac, 0x71, 0xe8, 0x04,
+	0x47, 0xf7, 0xa1, 0x00, 0x0b, 0xeb, 0x3c, 0xea, 0xad, 0x86, 0xff, 0x7c, 0x67, 0xbe, 0xf2, 0xc1,
+	0xfa, 0xca, 0x8f, 0x0e, 0xbf, 0xcd, 0xfa, 0xe8, 0xfb, 0xac, 0x8f, 0x7e, 0xce, 0xfa, 0xe8, 0xf9,
+	0xe0, 0x6f, 0xe3, 0x61, 0x79, 0x72, 0x8d, 0x23, 0x37, 0x06, 0xee, 0xfe, 0x0e, 0x00, 0x00, 0xff,
+	0xff, 0xb6, 0x8d, 0xb2, 0x1f, 0xd2, 0x04, 0x00, 0x00,
 }
diff --git a/server/cluster/cluster.pb.gw.go b/server/cluster/cluster.pb.gw.go
index 7c2c5320b5f1e..e01a99adb3841 100644
--- a/server/cluster/cluster.pb.gw.go
+++ b/server/cluster/cluster.pb.gw.go
@@ -49,7 +49,7 @@ func request_ClusterService_Create_0(ctx context.Context, marshaler runtime.Mars
 	var protoReq ClusterCreateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -85,11 +85,11 @@ func request_ClusterService_Get_0(ctx context.Context, marshaler runtime.Marshal
 
 }
 
-func request_ClusterService_UpdateREST_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ClusterRESTUpdateRequest
+func request_ClusterService_Update_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ClusterUpdateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Cluster); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -100,18 +100,18 @@ func request_ClusterService_UpdateREST_0(ctx context.Context, marshaler runtime.
 		_   = err
 	)
 
-	val, ok = pathParams["server"]
+	val, ok = pathParams["cluster.server"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "server")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "cluster.server")
 	}
 
-	protoReq.Server, err = runtime.String(val)
+	err = runtime.PopulateFieldFromPath(&protoReq, "cluster.server", val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "server", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "cluster.server", err)
 	}
 
-	msg, err := client.UpdateREST(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.Update(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
@@ -268,7 +268,7 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 
 	})
 
-	mux.Handle("PUT", pattern_ClusterService_UpdateREST_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("PUT", pattern_ClusterService_Update_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		if cn, ok := w.(http.CloseNotifier); ok {
@@ -286,14 +286,14 @@ func RegisterClusterServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_ClusterService_UpdateREST_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_ClusterService_Update_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_ClusterService_UpdateREST_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ClusterService_Update_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -336,7 +336,7 @@ var (
 
 	pattern_ClusterService_Get_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "clusters", "server"}, ""))
 
-	pattern_ClusterService_UpdateREST_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "clusters", "server"}, ""))
+	pattern_ClusterService_Update_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "clusters", "cluster.server"}, ""))
 
 	pattern_ClusterService_Delete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "clusters", "server"}, ""))
 )
@@ -348,7 +348,7 @@ var (
 
 	forward_ClusterService_Get_0 = runtime.ForwardResponseMessage
 
-	forward_ClusterService_UpdateREST_0 = runtime.ForwardResponseMessage
+	forward_ClusterService_Update_0 = runtime.ForwardResponseMessage
 
 	forward_ClusterService_Delete_0 = runtime.ForwardResponseMessage
 )
diff --git a/server/cluster/cluster.proto b/server/cluster/cluster.proto
index 8e4de84d4bac5..3140b6ce00e88 100644
--- a/server/cluster/cluster.proto
+++ b/server/cluster/cluster.proto
@@ -27,11 +27,6 @@ message ClusterUpdateRequest {
 	github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster cluster = 1;
 }
 
-message ClusterRESTUpdateRequest {
-	string server = 1;
-	github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster cluster = 2;
-}
-
 // ClusterService 
 service ClusterService {
 
@@ -55,13 +50,9 @@ service ClusterService {
 
 	// Update updates a cluster
 	rpc Update(ClusterUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) {
-	}
-
-	// Update updates a cluster (special handler intended to be used only by the gRPC gateway)
-	rpc UpdateREST(ClusterRESTUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) {
 		option (google.api.http) = {
-			put: "/api/v1/clusters/{server}"
-			body: "cluster"
+			put: "/api/v1/clusters/{cluster.server}"
+			body: "*"
 		};
 	}
 
diff --git a/server/cluster/mocks/ClusterServiceServer.go b/server/cluster/mocks/ClusterServiceServer.go
index 5e129cd158e4b..3ef9611ee6994 100644
--- a/server/cluster/mocks/ClusterServiceServer.go
+++ b/server/cluster/mocks/ClusterServiceServer.go
@@ -125,26 +125,3 @@ func (_m *ClusterServiceServer) Update(_a0 context.Context, _a1 *cluster.Cluster
 
 	return r0, r1
 }
-
-// UpdateREST provides a mock function with given fields: _a0, _a1
-func (_m *ClusterServiceServer) UpdateREST(_a0 context.Context, _a1 *cluster.ClusterRESTUpdateRequest) (*v1alpha1.Cluster, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 *v1alpha1.Cluster
-	if rf, ok := ret.Get(0).(func(context.Context, *cluster.ClusterRESTUpdateRequest) *v1alpha1.Cluster); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1alpha1.Cluster)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *cluster.ClusterRESTUpdateRequest) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
diff --git a/server/repository/mocks/RepositoryServiceServer.go b/server/repository/mocks/RepositoryServiceServer.go
index 726650e79898a..b419e8738b01b 100644
--- a/server/repository/mocks/RepositoryServiceServer.go
+++ b/server/repository/mocks/RepositoryServiceServer.go
@@ -148,26 +148,3 @@ func (_m *RepositoryServiceServer) Update(_a0 context.Context, _a1 *repository.R
 
 	return r0, r1
 }
-
-// UpdateREST provides a mock function with given fields: _a0, _a1
-func (_m *RepositoryServiceServer) UpdateREST(_a0 context.Context, _a1 *repository.RepoRESTUpdateRequest) (*v1alpha1.Repository, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 *v1alpha1.Repository
-	if rf, ok := ret.Get(0).(func(context.Context, *repository.RepoRESTUpdateRequest) *v1alpha1.Repository); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*v1alpha1.Repository)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *repository.RepoRESTUpdateRequest) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
diff --git a/server/repository/repository.go b/server/repository/repository.go
index 47a9dcc048d93..c192663e6d917 100644
--- a/server/repository/repository.go
+++ b/server/repository/repository.go
@@ -87,7 +87,7 @@ func (s *Server) ListKsonnetApps(ctx context.Context, q *RepoKsonnetQuery) (*Rep
 	}
 
 	return &RepoKsonnetResponse{
-		Data: out,
+		Items: out,
 	}, nil
 }
 
@@ -109,11 +109,6 @@ func (s *Server) Update(ctx context.Context, q *RepoUpdateRequest) (*appsv1.Repo
 	return redact(repo), err
 }
 
-// UpdateREST updates a repository (from a REST request)
-func (s *Server) UpdateREST(ctx context.Context, r *RepoRESTUpdateRequest) (*appsv1.Repository, error) {
-	return s.Update(ctx, &RepoUpdateRequest{Repo: r.Repo})
-}
-
 // Delete updates a repository
 func (s *Server) Delete(ctx context.Context, q *RepoQuery) (*RepoResponse, error) {
 	err := s.db.DeleteRepository(ctx, q.Repo)
diff --git a/server/repository/repository.pb.go b/server/repository/repository.pb.go
index 8dac7fb63b166..b298055bd0646 100644
--- a/server/repository/repository.pb.go
+++ b/server/repository/repository.pb.go
@@ -21,7 +21,6 @@
 		RepoResponse
 		RepoCreateRequest
 		RepoUpdateRequest
-		RepoRESTUpdateRequest
 */
 package repository
 
@@ -76,7 +75,7 @@ func (m *RepoKsonnetQuery) GetRevision() string {
 
 // RepoKsonnetResponse is a response for Repository contents matching a particular path
 type RepoKsonnetResponse struct {
-	Data []*KsonnetAppSpec `protobuf:"bytes,1,rep,name=data" json:"data,omitempty"`
+	Items []*KsonnetAppSpec `protobuf:"bytes,1,rep,name=items" json:"items,omitempty"`
 }
 
 func (m *RepoKsonnetResponse) Reset()                    { *m = RepoKsonnetResponse{} }
@@ -84,9 +83,9 @@ func (m *RepoKsonnetResponse) String() string            { return proto.CompactT
 func (*RepoKsonnetResponse) ProtoMessage()               {}
 func (*RepoKsonnetResponse) Descriptor() ([]byte, []int) { return fileDescriptorRepository, []int{1} }
 
-func (m *RepoKsonnetResponse) GetData() []*KsonnetAppSpec {
+func (m *RepoKsonnetResponse) GetItems() []*KsonnetAppSpec {
 	if m != nil {
-		return m.Data
+		return m.Items
 	}
 	return nil
 }
@@ -246,30 +245,6 @@ func (m *RepoUpdateRequest) GetRepo() *github_com_argoproj_argo_cd_pkg_apis_appl
 	return nil
 }
 
-type RepoRESTUpdateRequest struct {
-	Url  string                                                                `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
-	Repo *github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository `protobuf:"bytes,2,opt,name=repo" json:"repo,omitempty"`
-}
-
-func (m *RepoRESTUpdateRequest) Reset()                    { *m = RepoRESTUpdateRequest{} }
-func (m *RepoRESTUpdateRequest) String() string            { return proto.CompactTextString(m) }
-func (*RepoRESTUpdateRequest) ProtoMessage()               {}
-func (*RepoRESTUpdateRequest) Descriptor() ([]byte, []int) { return fileDescriptorRepository, []int{9} }
-
-func (m *RepoRESTUpdateRequest) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-func (m *RepoRESTUpdateRequest) GetRepo() *github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository {
-	if m != nil {
-		return m.Repo
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*RepoKsonnetQuery)(nil), "repository.RepoKsonnetQuery")
 	proto.RegisterType((*RepoKsonnetResponse)(nil), "repository.RepoKsonnetResponse")
@@ -280,7 +255,6 @@ func init() {
 	proto.RegisterType((*RepoResponse)(nil), "repository.RepoResponse")
 	proto.RegisterType((*RepoCreateRequest)(nil), "repository.RepoCreateRequest")
 	proto.RegisterType((*RepoUpdateRequest)(nil), "repository.RepoUpdateRequest")
-	proto.RegisterType((*RepoRESTUpdateRequest)(nil), "repository.RepoRESTUpdateRequest")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -304,8 +278,6 @@ type RepositoryServiceClient interface {
 	Get(ctx context.Context, in *RepoQuery, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
 	// Update updates a repo
 	Update(ctx context.Context, in *RepoUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
-	// Update updates a repo (special handler intended to be used only by the gRPC gateway)
-	UpdateREST(ctx context.Context, in *RepoRESTUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
 	// Delete updates a repo
 	Delete(ctx context.Context, in *RepoQuery, opts ...grpc.CallOption) (*RepoResponse, error)
 }
@@ -363,15 +335,6 @@ func (c *repositoryServiceClient) Update(ctx context.Context, in *RepoUpdateRequ
 	return out, nil
 }
 
-func (c *repositoryServiceClient) UpdateREST(ctx context.Context, in *RepoRESTUpdateRequest, opts ...grpc.CallOption) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error) {
-	out := new(github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository)
-	err := grpc.Invoke(ctx, "/repository.RepositoryService/UpdateREST", in, out, c.cc, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *repositoryServiceClient) Delete(ctx context.Context, in *RepoQuery, opts ...grpc.CallOption) (*RepoResponse, error) {
 	out := new(RepoResponse)
 	err := grpc.Invoke(ctx, "/repository.RepositoryService/Delete", in, out, c.cc, opts...)
@@ -394,8 +357,6 @@ type RepositoryServiceServer interface {
 	Get(context.Context, *RepoQuery) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
 	// Update updates a repo
 	Update(context.Context, *RepoUpdateRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
-	// Update updates a repo (special handler intended to be used only by the gRPC gateway)
-	UpdateREST(context.Context, *RepoRESTUpdateRequest) (*github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository, error)
 	// Delete updates a repo
 	Delete(context.Context, *RepoQuery) (*RepoResponse, error)
 }
@@ -494,24 +455,6 @@ func _RepositoryService_Update_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _RepositoryService_UpdateREST_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RepoRESTUpdateRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RepositoryServiceServer).UpdateREST(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/repository.RepositoryService/UpdateREST",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RepositoryServiceServer).UpdateREST(ctx, req.(*RepoRESTUpdateRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _RepositoryService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(RepoQuery)
 	if err := dec(in); err != nil {
@@ -554,10 +497,6 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "Update",
 			Handler:    _RepositoryService_Update_Handler,
 		},
-		{
-			MethodName: "UpdateREST",
-			Handler:    _RepositoryService_UpdateREST_Handler,
-		},
 		{
 			MethodName: "Delete",
 			Handler:    _RepositoryService_Delete_Handler,
@@ -612,8 +551,8 @@ func (m *RepoKsonnetResponse) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.Data) > 0 {
-		for _, msg := range m.Data {
+	if len(m.Items) > 0 {
+		for _, msg := range m.Items {
 			dAtA[i] = 0xa
 			i++
 			i = encodeVarintRepository(dAtA, i, uint64(msg.Size()))
@@ -853,40 +792,6 @@ func (m *RepoUpdateRequest) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
-func (m *RepoRESTUpdateRequest) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *RepoRESTUpdateRequest) MarshalTo(dAtA []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	if len(m.Url) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintRepository(dAtA, i, uint64(len(m.Url)))
-		i += copy(dAtA[i:], m.Url)
-	}
-	if m.Repo != nil {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintRepository(dAtA, i, uint64(m.Repo.Size()))
-		n5, err := m.Repo.MarshalTo(dAtA[i:])
-		if err != nil {
-			return 0, err
-		}
-		i += n5
-	}
-	return i, nil
-}
-
 func encodeVarintRepository(dAtA []byte, offset int, v uint64) int {
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
@@ -913,8 +818,8 @@ func (m *RepoKsonnetQuery) Size() (n int) {
 func (m *RepoKsonnetResponse) Size() (n int) {
 	var l int
 	_ = l
-	if len(m.Data) > 0 {
-		for _, e := range m.Data {
+	if len(m.Items) > 0 {
+		for _, e := range m.Items {
 			l = e.Size()
 			n += 1 + l + sovRepository(uint64(l))
 		}
@@ -1017,20 +922,6 @@ func (m *RepoUpdateRequest) Size() (n int) {
 	return n
 }
 
-func (m *RepoRESTUpdateRequest) Size() (n int) {
-	var l int
-	_ = l
-	l = len(m.Url)
-	if l > 0 {
-		n += 1 + l + sovRepository(uint64(l))
-	}
-	if m.Repo != nil {
-		l = m.Repo.Size()
-		n += 1 + l + sovRepository(uint64(l))
-	}
-	return n
-}
-
 func sovRepository(x uint64) (n int) {
 	for {
 		n++
@@ -1183,7 +1074,7 @@ func (m *RepoKsonnetResponse) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Items", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1207,8 +1098,8 @@ func (m *RepoKsonnetResponse) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Data = append(m.Data, &KsonnetAppSpec{})
-			if err := m.Data[len(m.Data)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Items = append(m.Items, &KsonnetAppSpec{})
+			if err := m.Items[len(m.Items)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -2008,118 +1899,6 @@ func (m *RepoUpdateRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *RepoRESTUpdateRequest) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowRepository
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: RepoRESTUpdateRequest: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: RepoRESTUpdateRequest: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Url", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowRepository
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthRepository
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Url = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Repo", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowRepository
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthRepository
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.Repo == nil {
-				m.Repo = &github_com_argoproj_argo_cd_pkg_apis_application_v1alpha1.Repository{}
-			}
-			if err := m.Repo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipRepository(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthRepository
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func skipRepository(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
@@ -2228,54 +2007,50 @@ var (
 func init() { proto.RegisterFile("server/repository/repository.proto", fileDescriptorRepository) }
 
 var fileDescriptorRepository = []byte{
-	// 770 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0x2e, 0x25, 0x55, 0xad, 0x47, 0x86, 0x6b, 0x6f, 0x6d, 0x43, 0x65, 0x65, 0xd9, 0x65, 0x7b,
-	0x70, 0x8d, 0x9a, 0x84, 0xd5, 0x1e, 0x0c, 0xf7, 0x54, 0xd7, 0x42, 0x61, 0xb8, 0x87, 0x84, 0xb2,
-	0x03, 0x24, 0x87, 0x18, 0x34, 0x35, 0xa0, 0x19, 0xd1, 0xdc, 0xcd, 0xee, 0x8a, 0x80, 0x10, 0xf8,
-	0x12, 0x04, 0x41, 0x6e, 0x39, 0xe4, 0x05, 0x72, 0x0a, 0x90, 0x37, 0xc9, 0x31, 0x40, 0x0e, 0xb9,
-	0x06, 0x46, 0x1e, 0x24, 0xd8, 0x25, 0x25, 0x51, 0xd6, 0xcf, 0x49, 0xc8, 0x6d, 0x76, 0xf7, 0x9b,
-	0xf9, 0xbe, 0x99, 0x9d, 0x59, 0x12, 0x2c, 0x81, 0x3c, 0x41, 0xee, 0x70, 0x64, 0x54, 0x84, 0x92,
-	0xf2, 0x5e, 0xce, 0xb4, 0x19, 0xa7, 0x92, 0x12, 0x18, 0xee, 0x98, 0xab, 0x01, 0x0d, 0xa8, 0xde,
-	0x76, 0x94, 0x95, 0x22, 0xcc, 0x5a, 0x40, 0x69, 0x10, 0xa1, 0xe3, 0xb1, 0xd0, 0xf1, 0xe2, 0x98,
-	0x4a, 0x4f, 0x86, 0x34, 0x16, 0xd9, 0xa9, 0xd5, 0xd9, 0x17, 0x76, 0x48, 0xf5, 0xa9, 0x4f, 0x39,
-	0x3a, 0xc9, 0x9e, 0x13, 0x60, 0x8c, 0xdc, 0x93, 0xd8, 0xce, 0x30, 0xc7, 0x41, 0x28, 0x2f, 0xbb,
-	0x17, 0xb6, 0x4f, 0xaf, 0x1c, 0x8f, 0x6b, 0x8a, 0x47, 0xda, 0xd8, 0xf5, 0xdb, 0x0e, 0xeb, 0x04,
-	0xca, 0x59, 0x38, 0x1e, 0x63, 0x51, 0xe8, 0xeb, 0xe0, 0x4e, 0xb2, 0xe7, 0x45, 0xec, 0xd2, 0x1b,
-	0x0b, 0x65, 0x1d, 0xc2, 0xb2, 0x8b, 0x8c, 0x9e, 0x08, 0x1a, 0xc7, 0x28, 0xef, 0x76, 0x91, 0xf7,
-	0x08, 0x81, 0x92, 0x4a, 0xa2, 0x6a, 0x6c, 0x19, 0xdb, 0x0b, 0xae, 0xb6, 0x89, 0x09, 0xdf, 0x73,
-	0x4c, 0x42, 0x11, 0xd2, 0xb8, 0x5a, 0xd0, 0xfb, 0x83, 0xb5, 0xd5, 0x84, 0x1f, 0x73, 0x31, 0x5c,
-	0x14, 0x8c, 0xc6, 0x02, 0x89, 0x0d, 0xa5, 0xb6, 0x27, 0xbd, 0xaa, 0xb1, 0x55, 0xdc, 0xae, 0x34,
-	0x4c, 0x3b, 0x57, 0xaa, 0x0c, 0xfa, 0x0f, 0x63, 0x2d, 0x86, 0xbe, 0xab, 0x71, 0xd6, 0x47, 0x03,
-	0x96, 0x46, 0x0f, 0x94, 0x92, 0xd8, 0xbb, 0xc2, 0xbe, 0x12, 0x65, 0x93, 0x3b, 0xb0, 0x88, 0x71,
-	0x12, 0x72, 0x1a, 0x5f, 0x61, 0x2c, 0x45, 0xb5, 0xa0, 0xc3, 0xff, 0x31, 0x3d, 0xbc, 0xdd, 0xcc,
-	0xc1, 0x9b, 0xb1, 0xe4, 0x3d, 0x77, 0x24, 0x82, 0x79, 0x0e, 0x2b, 0x63, 0x10, 0xb2, 0x0c, 0xc5,
-	0x0e, 0xf6, 0x32, 0x66, 0x65, 0x92, 0xbf, 0xe0, 0xdb, 0xc4, 0x8b, 0xba, 0xa8, 0xf3, 0xaf, 0x34,
-	0xea, 0x13, 0x18, 0x73, 0x61, 0xdc, 0x14, 0x7c, 0x50, 0xd8, 0x37, 0xac, 0xb7, 0x06, 0x90, 0x71,
-	0xc4, 0xc4, 0xec, 0xea, 0x00, 0x9d, 0x7d, 0x71, 0x0f, 0x79, 0xae, 0xd2, 0xb9, 0x1d, 0xe5, 0xc3,
-	0x3c, 0x79, 0x59, 0x2d, 0xa6, 0x3e, 0xca, 0x26, 0x27, 0x50, 0x69, 0xa3, 0x90, 0x61, 0xac, 0xef,
-	0xba, 0x5a, 0xd2, 0xf2, 0x7e, 0x9f, 0x2d, 0xef, 0x68, 0xe8, 0xe0, 0xe6, 0xbd, 0xad, 0x33, 0xd8,
-	0x98, 0x89, 0x26, 0xeb, 0x50, 0x4e, 0xc7, 0x20, 0xd3, 0x9d, 0xad, 0x48, 0x0d, 0x16, 0x54, 0x06,
-	0x82, 0x79, 0x3e, 0x66, 0xc2, 0x87, 0x1b, 0xd6, 0x26, 0x2c, 0xa8, 0x1e, 0x99, 0xda, 0x60, 0xd6,
-	0x12, 0x2c, 0x2a, 0x40, 0xbf, 0x7b, 0xac, 0x18, 0x56, 0xd4, 0xfa, 0x5f, 0x8e, 0x9e, 0x44, 0x17,
-	0x1f, 0x77, 0x51, 0x48, 0x72, 0x3f, 0xe7, 0x58, 0x69, 0x34, 0xed, 0xe1, 0x1c, 0xd8, 0xfd, 0x39,
-	0xd0, 0xc6, 0xb9, 0xdf, 0xb6, 0x59, 0x27, 0xb0, 0xd5, 0x1c, 0xd8, 0xb9, 0x39, 0xb0, 0xfb, 0x73,
-	0x60, 0xbb, 0x83, 0xe2, 0x64, 0xfc, 0x19, 0xdf, 0x19, 0x6b, 0x7f, 0x1d, 0xbe, 0x67, 0x06, 0xac,
-	0xe9, 0x84, 0x9b, 0xad, 0xd3, 0x51, 0xd2, 0x65, 0x28, 0x76, 0x79, 0xd4, 0xef, 0xbc, 0x2e, 0x8f,
-	0x06, 0x32, 0x0a, 0x73, 0x97, 0xd1, 0x78, 0xf3, 0x5d, 0x9a, 0x77, 0xba, 0xd9, 0x42, 0x9e, 0x84,
-	0x3e, 0x92, 0xe7, 0x06, 0x94, 0xfe, 0x0f, 0x85, 0x24, 0x6b, 0xf9, 0x2e, 0x1a, 0x5c, 0xa0, 0x79,
-	0x3c, 0x17, 0x09, 0x8a, 0xc1, 0xaa, 0x3d, 0xfd, 0xf0, 0xf9, 0x55, 0x61, 0x9d, 0xac, 0xea, 0x17,
-	0x2f, 0xd9, 0x1b, 0xbe, 0xa8, 0x21, 0x0a, 0x92, 0xc0, 0x0f, 0x0a, 0x35, 0x1c, 0x68, 0x41, 0x6a,
-	0xb7, 0x25, 0xe5, 0xdf, 0x2e, 0x73, 0x73, 0xca, 0xe9, 0xa0, 0xaf, 0x7e, 0xd3, 0x7c, 0x75, 0x52,
-	0x9b, 0xc4, 0xe7, 0x74, 0x52, 0x34, 0x79, 0x69, 0x40, 0x39, 0x6d, 0x3d, 0xb2, 0x71, 0x3b, 0xe2,
-	0x48, 0x4b, 0x9a, 0xf3, 0xb9, 0x0d, 0x6b, 0x53, 0xcb, 0xfa, 0xc9, 0x9a, 0x58, 0x86, 0x03, 0x63,
-	0x87, 0xbc, 0x30, 0xa0, 0xf8, 0x1f, 0x4e, 0xbd, 0x91, 0x39, 0xc9, 0xf8, 0x55, 0xcb, 0xd8, 0x20,
-	0x3f, 0x4f, 0xac, 0xce, 0x13, 0xb5, 0xba, 0x26, 0x0c, 0xca, 0x69, 0xc7, 0x8e, 0xd7, 0x66, 0xa4,
-	0x93, 0xe7, 0x25, 0xea, 0x1b, 0xf2, 0xda, 0x00, 0xc8, 0x42, 0x37, 0x5b, 0xa7, 0xe4, 0x97, 0xdb,
-	0xb4, 0x63, 0x43, 0x34, 0x2f, 0xea, 0x6d, 0x5d, 0x0f, 0xcb, 0x34, 0x27, 0xd7, 0xa3, 0xcb, 0xa3,
-	0xeb, 0x83, 0xf4, 0x03, 0xf9, 0x10, 0xca, 0x47, 0x18, 0xa1, 0xc4, 0x69, 0x37, 0x54, 0x1d, 0x13,
-	0xdd, 0x6f, 0xc9, 0xac, 0xe8, 0x3b, 0xb3, 0x8a, 0x7e, 0xf8, 0xf7, 0xbb, 0x9b, 0xba, 0xf1, 0xfe,
-	0xa6, 0x6e, 0x7c, 0xba, 0xa9, 0x1b, 0x0f, 0x76, 0x67, 0xfd, 0x01, 0x8c, 0xfd, 0xa5, 0x5c, 0x94,
-	0xf5, 0xc7, 0xfe, 0xcf, 0x2f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x77, 0xbb, 0x4e, 0xaa, 0xc1, 0x08,
-	0x00, 0x00,
+	// 717 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x4f, 0x13, 0x41,
+	0x14, 0xcf, 0xb6, 0xd0, 0xc8, 0x94, 0x20, 0x8c, 0x48, 0xea, 0x5a, 0x0a, 0x59, 0x35, 0x41, 0x94,
+	0x5d, 0xa9, 0x1e, 0x08, 0x9e, 0x44, 0x08, 0x21, 0x78, 0xd0, 0x25, 0x98, 0xe8, 0x41, 0xb2, 0x6c,
+	0x5f, 0x96, 0xb1, 0xed, 0xcc, 0x38, 0x33, 0xdd, 0xa4, 0x31, 0x5c, 0x3c, 0x18, 0x6f, 0x1e, 0x3c,
+	0xfa, 0x09, 0x3c, 0xf9, 0x35, 0x3c, 0x9a, 0x78, 0xf0, 0x6a, 0x88, 0x1f, 0xc4, 0xcc, 0xec, 0xb6,
+	0xdd, 0xd2, 0x3f, 0xa7, 0xc6, 0xdb, 0x9b, 0x37, 0xbf, 0xf7, 0xde, 0xef, 0xfd, 0x9b, 0x41, 0x8e,
+	0x04, 0x11, 0x83, 0xf0, 0x04, 0x70, 0x26, 0x89, 0x62, 0xa2, 0x9d, 0x11, 0x5d, 0x2e, 0x98, 0x62,
+	0x18, 0xf5, 0x34, 0xf6, 0x62, 0xc4, 0x22, 0x66, 0xd4, 0x9e, 0x96, 0x12, 0x84, 0x5d, 0x8e, 0x18,
+	0x8b, 0x1a, 0xe0, 0x05, 0x9c, 0x78, 0x01, 0xa5, 0x4c, 0x05, 0x8a, 0x30, 0x2a, 0xd3, 0x5b, 0xa7,
+	0xbe, 0x25, 0x5d, 0xc2, 0xcc, 0x6d, 0xc8, 0x04, 0x78, 0xf1, 0xa6, 0x17, 0x01, 0x05, 0x11, 0x28,
+	0xa8, 0xa5, 0x98, 0x83, 0x88, 0xa8, 0xb3, 0xd6, 0xa9, 0x1b, 0xb2, 0xa6, 0x17, 0x08, 0x13, 0xe2,
+	0xad, 0x11, 0x36, 0xc2, 0x9a, 0xc7, 0xeb, 0x91, 0x36, 0x96, 0x5e, 0xc0, 0x79, 0x83, 0x84, 0xc6,
+	0xb9, 0x17, 0x6f, 0x06, 0x0d, 0x7e, 0x16, 0x0c, 0xb8, 0x72, 0x76, 0xd0, 0xbc, 0x0f, 0x9c, 0x1d,
+	0x4a, 0x46, 0x29, 0xa8, 0x17, 0x2d, 0x10, 0x6d, 0x8c, 0xd1, 0x94, 0x4e, 0xa2, 0x64, 0xad, 0x5a,
+	0x6b, 0x33, 0xbe, 0x91, 0xb1, 0x8d, 0xae, 0x08, 0x88, 0x89, 0x24, 0x8c, 0x96, 0x72, 0x46, 0xdf,
+	0x3d, 0x3b, 0xfb, 0xe8, 0x5a, 0xc6, 0x87, 0x0f, 0x92, 0x33, 0x2a, 0x01, 0x3f, 0x40, 0xd3, 0x44,
+	0x41, 0x53, 0x96, 0xac, 0xd5, 0xfc, 0x5a, 0xb1, 0x6a, 0xbb, 0x99, 0x5a, 0xa5, 0xd8, 0x27, 0x9c,
+	0x1f, 0x71, 0x08, 0xfd, 0x04, 0xe8, 0xfc, 0xb6, 0xd0, 0x5c, 0xff, 0x8d, 0xe6, 0x42, 0x83, 0x26,
+	0x74, 0xb8, 0x68, 0x19, 0x3f, 0x47, 0xb3, 0x40, 0x63, 0x22, 0x18, 0x6d, 0x02, 0x55, 0xb2, 0x94,
+	0x33, 0xfe, 0xef, 0x8f, 0xf6, 0xef, 0xee, 0x65, 0xe0, 0x7b, 0x54, 0x89, 0xb6, 0xdf, 0xe7, 0xc1,
+	0x3e, 0x41, 0x0b, 0x03, 0x10, 0x3c, 0x8f, 0xf2, 0x75, 0x68, 0xa7, 0x91, 0xb5, 0x88, 0x1f, 0xa1,
+	0xe9, 0x38, 0x68, 0xb4, 0xc0, 0x54, 0xa0, 0x58, 0xad, 0x0c, 0x89, 0x98, 0x71, 0xe3, 0x27, 0xe0,
+	0xed, 0xdc, 0x96, 0xe5, 0x7c, 0xb3, 0x10, 0x1e, 0x44, 0x0c, 0xcd, 0xae, 0x82, 0x50, 0x7d, 0x4b,
+	0xbe, 0x04, 0x91, 0xa9, 0x75, 0x46, 0xa3, 0x6d, 0x78, 0xa0, 0xce, 0x4a, 0xf9, 0xc4, 0x46, 0xcb,
+	0xf8, 0x10, 0x15, 0x6b, 0x20, 0x15, 0xa1, 0xa6, 0xdb, 0xa5, 0x29, 0x43, 0xef, 0xee, 0x78, 0x7a,
+	0xbb, 0x3d, 0x03, 0x3f, 0x6b, 0xed, 0x1c, 0xa3, 0xe5, 0xb1, 0x68, 0xbc, 0x84, 0x0a, 0xc9, 0x22,
+	0xa4, 0xbc, 0xd3, 0x13, 0x2e, 0xa3, 0x19, 0x9d, 0x81, 0xe4, 0x41, 0x08, 0x29, 0xf1, 0x9e, 0xc2,
+	0x59, 0x41, 0x33, 0x7a, 0x4a, 0x46, 0x8e, 0x98, 0x33, 0x87, 0x66, 0x35, 0xa0, 0x33, 0x3f, 0x0e,
+	0x45, 0x0b, 0xfa, 0xfc, 0x54, 0x40, 0xa0, 0xc0, 0x87, 0x77, 0x2d, 0x90, 0x0a, 0xbf, 0xca, 0x18,
+	0x16, 0xab, 0x7b, 0x6e, 0x6f, 0x13, 0xdc, 0xce, 0x26, 0x18, 0xe1, 0x24, 0xac, 0xb9, 0xbc, 0x1e,
+	0xb9, 0x7a, 0x13, 0xdc, 0xcc, 0x26, 0xb8, 0x9d, 0x4d, 0x70, 0xfd, 0x6e, 0x71, 0xd2, 0xf8, 0x69,
+	0xbc, 0x63, 0x5e, 0xfb, 0x2f, 0xf1, 0xaa, 0xdf, 0x0b, 0x49, 0xc0, 0x44, 0x79, 0x04, 0x22, 0x26,
+	0x21, 0xe0, 0x8f, 0x16, 0x9a, 0x7a, 0x46, 0xa4, 0xc2, 0xd7, 0xb3, 0xed, 0xeb, 0x56, 0xce, 0x3e,
+	0x98, 0x08, 0x05, 0x1d, 0xc1, 0x29, 0x7f, 0xf8, 0xf5, 0xf7, 0x4b, 0x6e, 0x09, 0x2f, 0x9a, 0xc7,
+	0x26, 0xde, 0xec, 0x3d, 0x66, 0x04, 0x24, 0x8e, 0xd1, 0x55, 0x8d, 0xea, 0x6d, 0x92, 0xc4, 0xe5,
+	0xcb, 0x94, 0xb2, 0xcf, 0x86, 0xbd, 0x32, 0xe2, 0xb6, 0xdb, 0xd0, 0xdb, 0x26, 0x5e, 0x05, 0x97,
+	0x87, 0xc5, 0xf3, 0xea, 0x09, 0x1a, 0x7f, 0xb6, 0x50, 0x21, 0xe9, 0x39, 0x5e, 0xbe, 0xec, 0xb1,
+	0x6f, 0x16, 0xec, 0xc9, 0x74, 0xc3, 0x59, 0x31, 0xb4, 0x6e, 0x38, 0x43, 0xcb, 0xb0, 0x6d, 0xad,
+	0xe3, 0x4f, 0x16, 0xca, 0xef, 0xc3, 0xc8, 0x8e, 0x4c, 0x88, 0xc6, 0x2d, 0x43, 0x63, 0x19, 0xdf,
+	0x1c, 0x5a, 0x9d, 0xf7, 0xfa, 0x74, 0x8e, 0xbf, 0x5a, 0xa8, 0x90, 0x0c, 0xe8, 0x60, 0x71, 0xfa,
+	0x06, 0x77, 0x52, 0xac, 0xee, 0x19, 0x56, 0x77, 0x9c, 0xd5, 0xd1, 0xac, 0x0c, 0x8f, 0x73, 0x5d,
+	0xa8, 0x37, 0xa8, 0xb0, 0x0b, 0x0d, 0x50, 0x30, 0xaa, 0x54, 0xa5, 0xcb, 0xea, 0xee, 0x6c, 0xa4,
+	0xd9, 0xaf, 0x8f, 0xcb, 0x7e, 0xe7, 0xf1, 0x8f, 0x8b, 0x8a, 0xf5, 0xf3, 0xa2, 0x62, 0xfd, 0xb9,
+	0xa8, 0x58, 0xaf, 0x37, 0xc6, 0xfd, 0x82, 0x03, 0x3f, 0xf5, 0x69, 0xc1, 0x7c, 0x78, 0x0f, 0xff,
+	0x05, 0x00, 0x00, 0xff, 0xff, 0xde, 0xe3, 0x43, 0xb1, 0xc5, 0x07, 0x00, 0x00,
 }
diff --git a/server/repository/repository.pb.gw.go b/server/repository/repository.pb.gw.go
index 5fc3edc08d2d0..3f91ef9677290 100644
--- a/server/repository/repository.pb.gw.go
+++ b/server/repository/repository.pb.gw.go
@@ -66,7 +66,7 @@ func request_RepositoryService_Create_0(ctx context.Context, marshaler runtime.M
 	var protoReq RepoCreateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -102,11 +102,11 @@ func request_RepositoryService_Get_0(ctx context.Context, marshaler runtime.Mars
 
 }
 
-func request_RepositoryService_UpdateREST_0(ctx context.Context, marshaler runtime.Marshaler, client RepositoryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq RepoRESTUpdateRequest
+func request_RepositoryService_Update_0(ctx context.Context, marshaler runtime.Marshaler, client RepositoryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq RepoUpdateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Repo); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
@@ -117,18 +117,18 @@ func request_RepositoryService_UpdateREST_0(ctx context.Context, marshaler runti
 		_   = err
 	)
 
-	val, ok = pathParams["url"]
+	val, ok = pathParams["repo.repo"]
 	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "url")
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "repo.repo")
 	}
 
-	protoReq.Url, err = runtime.String(val)
+	err = runtime.PopulateFieldFromPath(&protoReq, "repo.repo", val)
 
 	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "url", err)
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "repo.repo", err)
 	}
 
-	msg, err := client.UpdateREST(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.Update(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
@@ -314,7 +314,7 @@ func RegisterRepositoryServiceHandlerClient(ctx context.Context, mux *runtime.Se
 
 	})
 
-	mux.Handle("PUT", pattern_RepositoryService_UpdateREST_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_RepositoryService_Update_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		if cn, ok := w.(http.CloseNotifier); ok {
@@ -332,14 +332,14 @@ func RegisterRepositoryServiceHandlerClient(ctx context.Context, mux *runtime.Se
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_RepositoryService_UpdateREST_0(rctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_RepositoryService_Update_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_RepositoryService_UpdateREST_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_RepositoryService_Update_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -384,7 +384,7 @@ var (
 
 	pattern_RepositoryService_Get_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "repositories", "repo"}, ""))
 
-	pattern_RepositoryService_UpdateREST_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "repositories", "url"}, ""))
+	pattern_RepositoryService_Update_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "repositories", "repo.repo"}, ""))
 
 	pattern_RepositoryService_Delete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"api", "v1", "repositories", "repo"}, ""))
 )
@@ -398,7 +398,7 @@ var (
 
 	forward_RepositoryService_Get_0 = runtime.ForwardResponseMessage
 
-	forward_RepositoryService_UpdateREST_0 = runtime.ForwardResponseMessage
+	forward_RepositoryService_Update_0 = runtime.ForwardResponseMessage
 
 	forward_RepositoryService_Delete_0 = runtime.ForwardResponseMessage
 )
diff --git a/server/repository/repository.proto b/server/repository/repository.proto
index 0e9830c6b89b1..2e01e09cdbb00 100644
--- a/server/repository/repository.proto
+++ b/server/repository/repository.proto
@@ -19,7 +19,7 @@ message RepoKsonnetQuery {
 
 // RepoKsonnetResponse is a response for Repository contents matching a particular path
 message RepoKsonnetResponse {
-	repeated KsonnetAppSpec data = 1;
+	repeated KsonnetAppSpec items = 1;
 }
 
 // KsonnetAppSpec contains Ksonnet app response
@@ -62,11 +62,6 @@ message RepoUpdateRequest {
     github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1;
 }
 
-message RepoRESTUpdateRequest {
-	string url = 1;
-	github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 2;
-}
-
 // RepositoryService 
 service RepositoryService {
 
@@ -95,13 +90,9 @@ service RepositoryService {
 
 	// Update updates a repo
 	rpc Update(RepoUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) {
-	}
-
-	// Update updates a repo (special handler intended to be used only by the gRPC gateway)
-	rpc UpdateREST(RepoRESTUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) {
 		option (google.api.http) = {
-			put: "/api/v1/repositories/{url}"
-			body: "repo"
+			post: "/api/v1/repositories/{repo.repo}"
+			body: "*"
 		};
 	}
 
diff --git a/server/session/session.pb.gw.go b/server/session/session.pb.gw.go
index 70570b16c01a6..68fb8b2c414b5 100644
--- a/server/session/session.pb.gw.go
+++ b/server/session/session.pb.gw.go
@@ -32,7 +32,7 @@ func request_SessionService_Create_0(ctx context.Context, marshaler runtime.Mars
 	var protoReq SessionCreateRequest
 	var metadata runtime.ServerMetadata
 
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil {
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
diff --git a/server/settings/settings.proto b/server/settings/settings.proto
index 95ec8d7dcc22c..00176f1f39042 100644
--- a/server/settings/settings.proto
+++ b/server/settings/settings.proto
@@ -14,7 +14,7 @@ message SettingsQuery {
 }
 
 message Settings {
-    string url = 1 [(gogoproto.customname) = "URL"];;
+    string url = 1 [(gogoproto.customname) = "URL"];
     DexConfig dexConfig = 2;
 }