diff --git a/Makefile b/Makefile
index c97cb9202e5..cda644aa20f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ all: update-tools clean proto bins check test
 clean: clean-bins clean-test-results
 
 # Recompile proto files.
-proto: clean-proto install-proto-submodule protoc fix-proto-path proto-mock goimports-proto
+proto: clean-proto install-proto-submodule buf api-linter protoc fix-proto-path proto-mock goimports-proto
 
 # Update proto submodule from remote and recompile proto files.
-update-proto: clean-proto update-proto-submodule protoc fix-proto-path update-go-api proto-mock goimports-proto gomodtidy
+update-proto: clean-proto update-proto-submodule buf api-linter protoc fix-proto-path update-go-api proto-mock goimports-proto gomodtidy
 
 # Build all docker images.
 docker-images:
@@ -80,8 +80,9 @@ override TEST_TAG := -tags $(TEST_TAG)
 endif
 
 PROTO_ROOT := proto
-PROTO_DIRS = $(sort $(dir $(shell find $(PROTO_ROOT)/internal -name "*.proto")))
-PROTO_IMPORT := $(PROTO_ROOT)/internal:$(PROTO_ROOT)/api:$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
+PROTO_FILES = $(shell find ./$(PROTO_ROOT)/internal -name "*.proto")
+PROTO_DIRS = $(sort $(dir $(PROTO_FILES)))
+PROTO_IMPORTS := -I=$(PROTO_ROOT)/internal -I=$(PROTO_ROOT)/api -I=$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
 PROTO_OUT := api
 
 ALL_SRC         := $(shell find . -name "*.go" | grep -v -e "^$(PROTO_OUT)")
@@ -116,6 +117,8 @@ update-checkers:
 	GO111MODULE=off go get -u golang.org/x/lint/golint
 	GO111MODULE=off go get -u honnef.co/go/tools/cmd/staticcheck
 	GO111MODULE=off go get -u github.com/kisielk/errcheck
+	GO111MODULE=off go get -u github.com/googleapis/api-linter/cmd/api-linter
+	GO111MODULE=off go get -u github.com/bufbuild/buf/cmd/buf
 
 update-mockgen:
 	@printf $(COLOR) "Install/update mockgen tool..."
@@ -146,7 +149,7 @@ install-proto-submodule:
 protoc: $(PROTO_OUT)
 	@printf $(COLOR) "Build proto files..."
 # Run protoc separately for each directory because of different package names.
-	$(foreach PROTO_DIR,$(PROTO_DIRS),protoc --proto_path=$(PROTO_IMPORT) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto$(NEWLINE))
+	$(foreach PROTO_DIR,$(PROTO_DIRS),protoc $(PROTO_IMPORTS) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto$(NEWLINE))
 
 fix-proto-path:
 	mv -f $(PROTO_OUT)/temporal/server/api/* $(PROTO_OUT) && rm -rf $(PROTO_OUT)/temporal
@@ -222,6 +225,14 @@ errcheck:
 	@printf $(COLOR) "Run errcheck..."
 	@errcheck ./... || true
 
+api-linter:
+	@printf $(COLOR) "Running api-linter..."
+	@api-linter --set-exit-status --output-format=summary $(PROTO_IMPORTS) --config=$(PROTO_ROOT)/api-linter.yaml $(PROTO_FILES)
+
+buf:
+	@printf $(COLOR) "Running buf linter..."
+	@(cd $(PROTO_ROOT) && buf check lint)
+
 check: copyright goimports-check lint vet staticcheck errcheck
 
 ##### Tests #####
diff --git a/api/adminservice/v1/request_response.pb.go b/api/adminservice/v1/request_response.pb.go
index da3b81fceac..4cade869600 100644
--- a/api/adminservice/v1/request_response.pb.go
+++ b/api/adminservice/v1/request_response.pb.go
@@ -1343,7 +1343,7 @@ func (m *DescribeClusterResponse) GetMembershipInfo() *v17.MembershipInfo {
 	return nil
 }
 
-type ReadDLQMessagesRequest struct {
+type GetDLQMessagesRequest struct {
 	Type                  v12.DeadLetterQueueType `protobuf:"varint,1,opt,name=type,proto3,enum=temporal.server.api.enums.v1.DeadLetterQueueType" json:"type,omitempty"`
 	ShardId               int32                   `protobuf:"varint,2,opt,name=shard_id,json=shardId,proto3" json:"shard_id,omitempty"`
 	SourceCluster         string                  `protobuf:"bytes,3,opt,name=source_cluster,json=sourceCluster,proto3" json:"source_cluster,omitempty"`
@@ -1352,17 +1352,17 @@ type ReadDLQMessagesRequest struct {
 	NextPageToken         []byte                  `protobuf:"bytes,6,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 }
 
-func (m *ReadDLQMessagesRequest) Reset()      { *m = ReadDLQMessagesRequest{} }
-func (*ReadDLQMessagesRequest) ProtoMessage() {}
-func (*ReadDLQMessagesRequest) Descriptor() ([]byte, []int) {
+func (m *GetDLQMessagesRequest) Reset()      { *m = GetDLQMessagesRequest{} }
+func (*GetDLQMessagesRequest) ProtoMessage() {}
+func (*GetDLQMessagesRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_cc07c1a2abe7cb51, []int{24}
 }
-func (m *ReadDLQMessagesRequest) XXX_Unmarshal(b []byte) error {
+func (m *GetDLQMessagesRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ReadDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *GetDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ReadDLQMessagesRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_GetDLQMessagesRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -1372,77 +1372,77 @@ func (m *ReadDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]by
 		return b[:n], nil
 	}
 }
-func (m *ReadDLQMessagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadDLQMessagesRequest.Merge(m, src)
+func (m *GetDLQMessagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDLQMessagesRequest.Merge(m, src)
 }
-func (m *ReadDLQMessagesRequest) XXX_Size() int {
+func (m *GetDLQMessagesRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *ReadDLQMessagesRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReadDLQMessagesRequest.DiscardUnknown(m)
+func (m *GetDLQMessagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDLQMessagesRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ReadDLQMessagesRequest proto.InternalMessageInfo
+var xxx_messageInfo_GetDLQMessagesRequest proto.InternalMessageInfo
 
-func (m *ReadDLQMessagesRequest) GetType() v12.DeadLetterQueueType {
+func (m *GetDLQMessagesRequest) GetType() v12.DeadLetterQueueType {
 	if m != nil {
 		return m.Type
 	}
 	return v12.DEAD_LETTER_QUEUE_TYPE_UNSPECIFIED
 }
 
-func (m *ReadDLQMessagesRequest) GetShardId() int32 {
+func (m *GetDLQMessagesRequest) GetShardId() int32 {
 	if m != nil {
 		return m.ShardId
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetSourceCluster() string {
+func (m *GetDLQMessagesRequest) GetSourceCluster() string {
 	if m != nil {
 		return m.SourceCluster
 	}
 	return ""
 }
 
-func (m *ReadDLQMessagesRequest) GetInclusiveEndMessageId() int64 {
+func (m *GetDLQMessagesRequest) GetInclusiveEndMessageId() int64 {
 	if m != nil {
 		return m.InclusiveEndMessageId
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetMaximumPageSize() int32 {
+func (m *GetDLQMessagesRequest) GetMaximumPageSize() int32 {
 	if m != nil {
 		return m.MaximumPageSize
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetNextPageToken() []byte {
+func (m *GetDLQMessagesRequest) GetNextPageToken() []byte {
 	if m != nil {
 		return m.NextPageToken
 	}
 	return nil
 }
 
-type ReadDLQMessagesResponse struct {
+type GetDLQMessagesResponse struct {
 	Type             v12.DeadLetterQueueType `protobuf:"varint,1,opt,name=type,proto3,enum=temporal.server.api.enums.v1.DeadLetterQueueType" json:"type,omitempty"`
 	ReplicationTasks []*v13.ReplicationTask  `protobuf:"bytes,2,rep,name=replication_tasks,json=replicationTasks,proto3" json:"replication_tasks,omitempty"`
 	NextPageToken    []byte                  `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 }
 
-func (m *ReadDLQMessagesResponse) Reset()      { *m = ReadDLQMessagesResponse{} }
-func (*ReadDLQMessagesResponse) ProtoMessage() {}
-func (*ReadDLQMessagesResponse) Descriptor() ([]byte, []int) {
+func (m *GetDLQMessagesResponse) Reset()      { *m = GetDLQMessagesResponse{} }
+func (*GetDLQMessagesResponse) ProtoMessage() {}
+func (*GetDLQMessagesResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_cc07c1a2abe7cb51, []int{25}
 }
-func (m *ReadDLQMessagesResponse) XXX_Unmarshal(b []byte) error {
+func (m *GetDLQMessagesResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ReadDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *GetDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ReadDLQMessagesResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_GetDLQMessagesResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -1452,33 +1452,33 @@ func (m *ReadDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]b
 		return b[:n], nil
 	}
 }
-func (m *ReadDLQMessagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadDLQMessagesResponse.Merge(m, src)
+func (m *GetDLQMessagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDLQMessagesResponse.Merge(m, src)
 }
-func (m *ReadDLQMessagesResponse) XXX_Size() int {
+func (m *GetDLQMessagesResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *ReadDLQMessagesResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReadDLQMessagesResponse.DiscardUnknown(m)
+func (m *GetDLQMessagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDLQMessagesResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ReadDLQMessagesResponse proto.InternalMessageInfo
+var xxx_messageInfo_GetDLQMessagesResponse proto.InternalMessageInfo
 
-func (m *ReadDLQMessagesResponse) GetType() v12.DeadLetterQueueType {
+func (m *GetDLQMessagesResponse) GetType() v12.DeadLetterQueueType {
 	if m != nil {
 		return m.Type
 	}
 	return v12.DEAD_LETTER_QUEUE_TYPE_UNSPECIFIED
 }
 
-func (m *ReadDLQMessagesResponse) GetReplicationTasks() []*v13.ReplicationTask {
+func (m *GetDLQMessagesResponse) GetReplicationTasks() []*v13.ReplicationTask {
 	if m != nil {
 		return m.ReplicationTasks
 	}
 	return nil
 }
 
-func (m *ReadDLQMessagesResponse) GetNextPageToken() []byte {
+func (m *GetDLQMessagesResponse) GetNextPageToken() []byte {
 	if m != nil {
 		return m.NextPageToken
 	}
@@ -1961,8 +1961,8 @@ func init() {
 	proto.RegisterType((*AddSearchAttributeResponse)(nil), "temporal.server.api.adminservice.v1.AddSearchAttributeResponse")
 	proto.RegisterType((*DescribeClusterRequest)(nil), "temporal.server.api.adminservice.v1.DescribeClusterRequest")
 	proto.RegisterType((*DescribeClusterResponse)(nil), "temporal.server.api.adminservice.v1.DescribeClusterResponse")
-	proto.RegisterType((*ReadDLQMessagesRequest)(nil), "temporal.server.api.adminservice.v1.ReadDLQMessagesRequest")
-	proto.RegisterType((*ReadDLQMessagesResponse)(nil), "temporal.server.api.adminservice.v1.ReadDLQMessagesResponse")
+	proto.RegisterType((*GetDLQMessagesRequest)(nil), "temporal.server.api.adminservice.v1.GetDLQMessagesRequest")
+	proto.RegisterType((*GetDLQMessagesResponse)(nil), "temporal.server.api.adminservice.v1.GetDLQMessagesResponse")
 	proto.RegisterType((*PurgeDLQMessagesRequest)(nil), "temporal.server.api.adminservice.v1.PurgeDLQMessagesRequest")
 	proto.RegisterType((*PurgeDLQMessagesResponse)(nil), "temporal.server.api.adminservice.v1.PurgeDLQMessagesResponse")
 	proto.RegisterType((*MergeDLQMessagesRequest)(nil), "temporal.server.api.adminservice.v1.MergeDLQMessagesRequest")
@@ -1978,127 +1978,127 @@ func init() {
 }
 
 var fileDescriptor_cc07c1a2abe7cb51 = []byte{
-	// 1915 bytes of a gzipped FileDescriptorProto
+	// 1911 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x6f, 0x1b, 0xd7,
-	0x11, 0xd7, 0x92, 0xa1, 0x3e, 0x46, 0x16, 0x25, 0xae, 0x65, 0x89, 0xa2, 0x1d, 0x86, 0xde, 0xc4,
-	0xb1, 0x1c, 0xb4, 0x54, 0x25, 0x17, 0xf9, 0x2a, 0x7a, 0xb0, 0x3e, 0xe2, 0x10, 0xb5, 0x5b, 0x7b,
-	0x69, 0xd8, 0x41, 0x81, 0x62, 0xb3, 0xe4, 0x0e, 0xa5, 0x85, 0xb8, 0xbb, 0xec, 0x7b, 0x6f, 0x29,
-	0xd3, 0x05, 0x82, 0x1e, 0x52, 0xa0, 0x45, 0x2f, 0xb9, 0xf4, 0x3f, 0xe8, 0xa1, 0x87, 0xa2, 0xfd,
-	0x1b, 0xda, 0x5e, 0x72, 0x74, 0x7b, 0x0a, 0x50, 0x14, 0xa8, 0xe5, 0x4b, 0xd1, 0x53, 0x4e, 0x3d,
-	0x17, 0xef, 0x6b, 0xb9, 0x14, 0x57, 0xb4, 0xdc, 0x24, 0x2e, 0xe0, 0x9b, 0x76, 0xe6, 0x37, 0xf3,
-	0xe6, 0xeb, 0xcd, 0xcc, 0xa3, 0xe0, 0x7d, 0x86, 0x41, 0x2f, 0x22, 0x6e, 0x77, 0x83, 0x22, 0xe9,
-	0x23, 0xd9, 0x70, 0x7b, 0xfe, 0x86, 0xeb, 0x05, 0x7e, 0xc8, 0xbf, 0xfd, 0x36, 0x6e, 0xf4, 0x37,
-	0x37, 0x08, 0xfe, 0x34, 0x46, 0xca, 0x1c, 0x82, 0xb4, 0x17, 0x85, 0x14, 0xeb, 0x3d, 0x12, 0xb1,
-	0xc8, 0x7c, 0x5d, 0xcb, 0xd6, 0xa5, 0x6c, 0xdd, 0xed, 0xf9, 0xf5, 0xb4, 0x6c, 0xbd, 0xbf, 0x59,
-	0xb1, 0x92, 0x03, 0xb8, 0x66, 0x0c, 0xe3, 0x80, 0x72, 0x95, 0xed, 0x28, 0x08, 0xa2, 0x50, 0x2a,
-	0xaa, 0xbc, 0x31, 0x82, 0x91, 0x2c, 0x0e, 0x0a, 0x90, 0x52, 0x77, 0x5f, 0x1d, 0x57, 0xb9, 0x32,
-	0x82, 0xea, 0x23, 0xa1, 0x7e, 0x16, 0xec, 0x5b, 0x59, 0x1e, 0xb5, 0xbb, 0x31, 0x65, 0x48, 0xc6,
-	0xd1, 0xd7, 0xb2, 0xd0, 0xd9, 0x56, 0x5e, 0x9d, 0x08, 0x65, 0x2e, 0x3d, 0x54, 0xc0, 0x7a, 0x16,
-	0x30, 0x74, 0x03, 0xa4, 0x3d, 0x57, 0x06, 0xf4, 0x0c, 0x16, 0x1f, 0xf8, 0x94, 0x45, 0x64, 0x30,
-	0x8e, 0xfe, 0x4e, 0x16, 0x9a, 0x60, 0xaf, 0xeb, 0xb7, 0x5d, 0x96, 0x15, 0x11, 0xeb, 0x57, 0x06,
-	0xd4, 0x76, 0x91, 0xb6, 0x89, 0xdf, 0xc2, 0x07, 0x11, 0x39, 0xec, 0x74, 0xa3, 0xa3, 0xbd, 0x87,
-	0xd8, 0x8e, 0x39, 0xdc, 0x96, 0xb9, 0x35, 0x2f, 0xc1, 0x5c, 0x62, 0x62, 0xd9, 0xa8, 0x19, 0xeb,
-	0x73, 0xf6, 0x90, 0x60, 0xde, 0x84, 0x39, 0xd4, 0x12, 0xe5, 0x5c, 0xcd, 0x58, 0x9f, 0xdf, 0xba,
-	0x96, 0xb8, 0x29, 0xf2, 0xae, 0x42, 0xd5, 0xdf, 0xac, 0x8f, 0x1f, 0x31, 0x94, 0xb5, 0xfe, 0x6a,
-	0xc0, 0xe5, 0x09, 0xb6, 0xc8, 0xfa, 0x32, 0xd7, 0x60, 0x96, 0x1e, 0xb8, 0xc4, 0x73, 0x7c, 0x4f,
-	0xd9, 0x32, 0x23, 0xbe, 0x1b, 0x9e, 0x79, 0x19, 0xce, 0xa9, 0xd0, 0x38, 0xae, 0xe7, 0x11, 0x61,
-	0xcc, 0x9c, 0x3d, 0xaf, 0x68, 0x37, 0x3c, 0x8f, 0x98, 0xd7, 0x61, 0x25, 0x88, 0x99, 0xdb, 0xea,
-	0xa2, 0x43, 0x99, 0xcb, 0xd0, 0xf1, 0x43, 0xa7, 0xed, 0xb6, 0x0f, 0xb0, 0x9c, 0x17, 0xe0, 0xf3,
-	0x8a, 0xdb, 0xe4, 0xcc, 0x46, 0xb8, 0xc3, 0x59, 0xe6, 0x7b, 0xb0, 0x36, 0x26, 0xe4, 0xb9, 0xcc,
-	0x6d, 0xb9, 0x14, 0xcb, 0xaf, 0x08, 0xb9, 0x95, 0x51, 0xb9, 0x5d, 0xc5, 0xb5, 0xfe, 0x62, 0x40,
-	0x45, 0xfb, 0xf4, 0xa1, 0xb4, 0xe3, 0xc3, 0x88, 0x32, 0x1d, 0x59, 0x6e, 0x71, 0x44, 0x99, 0x30,
-	0x17, 0x29, 0x55, 0x0e, 0xcd, 0x73, 0xda, 0x0d, 0x49, 0x32, 0xaf, 0x41, 0x49, 0xfb, 0xeb, 0x74,
-	0x22, 0xe2, 0x70, 0x9e, 0xf0, 0xac, 0x60, 0x17, 0x95, 0xe3, 0x1f, 0x44, 0x84, 0x2b, 0x35, 0x1f,
-	0x80, 0x99, 0x44, 0x73, 0x88, 0xcd, 0x3f, 0x6f, 0x4a, 0x96, 0x12, 0x25, 0x4a, 0xb1, 0xf5, 0x9b,
-	0x1c, 0x5c, 0xcc, 0xf4, 0x42, 0xe5, 0x64, 0x1d, 0x96, 0xc2, 0x38, 0x68, 0x21, 0x71, 0xa2, 0x8e,
-	0x23, 0x8c, 0x92, 0xae, 0x14, 0xec, 0xa2, 0xa4, 0xff, 0xa8, 0xd3, 0x14, 0x54, 0xf3, 0x22, 0xcc,
-	0x69, 0x6f, 0x68, 0x39, 0x57, 0xcb, 0xaf, 0x17, 0xec, 0x59, 0xe5, 0x05, 0x35, 0x7f, 0x02, 0x8b,
-	0x49, 0x59, 0xa5, 0xb2, 0x32, 0xbf, 0xf5, 0xdd, 0x7a, 0x56, 0x3b, 0x49, 0xb0, 0xdc, 0x8d, 0x1f,
-	0xea, 0x0f, 0x91, 0xb2, 0x46, 0xd8, 0x89, 0xec, 0x62, 0x38, 0x42, 0x33, 0xdf, 0x86, 0x55, 0x79,
-	0x76, 0x3b, 0x0a, 0x19, 0x89, 0xba, 0x5d, 0x24, 0x22, 0x9f, 0x31, 0x55, 0x49, 0xbc, 0x20, 0xd8,
-	0x3b, 0x09, 0xb7, 0x29, 0x98, 0x66, 0x19, 0x66, 0x74, 0x7e, 0x0a, 0xb2, 0xe0, 0xd4, 0xa7, 0x55,
-	0x87, 0xd2, 0x4e, 0x37, 0xa2, 0x28, 0x9c, 0xd3, 0x39, 0x3d, 0x59, 0xa0, 0x85, 0xa4, 0x40, 0xad,
-	0x65, 0x30, 0xd3, 0x78, 0x19, 0x3d, 0xeb, 0xcf, 0x06, 0x94, 0x6c, 0x0c, 0xa2, 0x3e, 0xde, 0x73,
-	0xe9, 0xe1, 0xb3, 0xd5, 0x98, 0x1f, 0xc0, 0x6c, 0xdb, 0x65, 0xb8, 0x1f, 0x91, 0x81, 0xa8, 0x84,
-	0xe2, 0xd6, 0x5b, 0x99, 0x01, 0x12, 0x0d, 0x88, 0x07, 0x87, 0xeb, 0xdd, 0x51, 0x12, 0x76, 0x22,
-	0x6b, 0xae, 0xc2, 0x0c, 0x6f, 0x4d, 0xfc, 0x04, 0x1e, 0xe7, 0xbc, 0x3d, 0xcd, 0x3f, 0x1b, 0x9e,
-	0xb9, 0x09, 0xcb, 0x7d, 0x9f, 0xfa, 0x2d, 0xbf, 0xeb, 0xb3, 0x81, 0xc3, 0xfc, 0x00, 0x29, 0x73,
-	0x83, 0x9e, 0x08, 0x53, 0xde, 0x3e, 0x3f, 0xe4, 0xdd, 0xd3, 0x2c, 0xee, 0x5a, 0xda, 0x07, 0xe5,
-	0xda, 0xef, 0x73, 0x70, 0xe5, 0x26, 0xb2, 0xf1, 0x1a, 0x73, 0x8f, 0x54, 0x1d, 0xbd, 0xd8, 0x1e,
-	0x63, 0xbe, 0x01, 0xc5, 0x8e, 0x4f, 0x28, 0x73, 0xb0, 0x8f, 0x21, 0x1b, 0x7a, 0x7e, 0x4e, 0x50,
-	0xf7, 0x38, 0xb1, 0xe1, 0x99, 0x16, 0x2c, 0x84, 0xf8, 0x30, 0x05, 0x92, 0x8e, 0xcf, 0x73, 0xa2,
-	0xc6, 0xbc, 0x05, 0xa5, 0xc0, 0x7d, 0xe8, 0x07, 0x71, 0xe0, 0xf4, 0xdc, 0x7d, 0x74, 0xa8, 0xff,
-	0x08, 0x45, 0x7d, 0x14, 0xec, 0x45, 0xc5, 0xb8, 0xe3, 0xee, 0x63, 0xd3, 0x7f, 0x84, 0xe6, 0x9b,
-	0xb0, 0x28, 0xf4, 0x09, 0x20, 0x8b, 0x0e, 0x31, 0x2c, 0x4f, 0xd7, 0x8c, 0xf5, 0x73, 0xb6, 0x38,
-	0x86, 0xc3, 0xee, 0x71, 0xa2, 0xf5, 0xb7, 0x3c, 0xbc, 0xf9, 0xac, 0x70, 0xa9, 0x2b, 0x97, 0xa1,
-	0xd2, 0xc8, 0x50, 0x69, 0x36, 0x60, 0x51, 0xf7, 0xc4, 0x96, 0xcb, 0xda, 0x07, 0x28, 0xaf, 0xdd,
-	0xfc, 0x56, 0xed, 0xb4, 0xf8, 0xf1, 0xde, 0xb5, 0xdd, 0x8d, 0x5a, 0x76, 0x51, 0x09, 0x6e, 0x4b,
-	0x39, 0xf3, 0xd7, 0x06, 0x2c, 0xa5, 0x86, 0x89, 0xe3, 0x87, 0x9d, 0xa8, 0x9c, 0x17, 0xca, 0x3e,
-	0xae, 0x9f, 0x61, 0xde, 0xd7, 0xcf, 0xe6, 0x5a, 0xdd, 0x1e, 0x9e, 0xc1, 0xef, 0xf1, 0x5e, 0xc8,
-	0xc8, 0xc0, 0x5e, 0x24, 0xa3, 0x54, 0xb3, 0x0e, 0xe7, 0x65, 0x7a, 0xb8, 0x30, 0x3a, 0x6a, 0xe6,
-	0x8b, 0x4c, 0x15, 0xec, 0x92, 0x60, 0x35, 0x39, 0xe7, 0xbe, 0x64, 0x54, 0x8e, 0x60, 0x39, 0x4b,
-	0xb1, 0xb9, 0x04, 0xf9, 0x43, 0x1c, 0xa8, 0x92, 0xe3, 0x7f, 0x9a, 0x0d, 0x28, 0xf4, 0xdd, 0x6e,
-	0x8c, 0xaa, 0xd0, 0xae, 0x67, 0xfa, 0x96, 0x32, 0x87, 0xbb, 0x76, 0x42, 0xb5, 0x2d, 0x35, 0xbc,
-	0x9f, 0x7b, 0xd7, 0xb0, 0x7e, 0x99, 0x87, 0xab, 0x93, 0x3d, 0xbf, 0xbf, 0xf5, 0xe2, 0x6f, 0x01,
-	0x65, 0x2e, 0x19, 0xbf, 0x05, 0x82, 0xaa, 0x2b, 0xbc, 0x0e, 0xe7, 0xd3, 0xa8, 0x74, 0x84, 0xf3,
-	0x76, 0x69, 0x08, 0x55, 0x11, 0x36, 0x6b, 0x70, 0x0e, 0x43, 0x6f, 0xa8, 0xb3, 0x20, 0x80, 0x80,
-	0xa1, 0x97, 0xba, 0x33, 0x43, 0x84, 0xd6, 0x37, 0x2d, 0x60, 0x8b, 0x1a, 0xa6, 0xb5, 0x65, 0xde,
-	0xaf, 0x99, 0x33, 0xdf, 0xaf, 0xd9, 0xac, 0xfb, 0xf5, 0x1f, 0x03, 0xd6, 0x9f, 0x9d, 0x8a, 0xff,
-	0xdf, 0x0d, 0x7b, 0x00, 0x8b, 0x2a, 0x2a, 0x8e, 0xe2, 0xa8, 0x01, 0x58, 0xcf, 0xac, 0x41, 0x85,
-	0xe1, 0x2a, 0x55, 0xd4, 0xf4, 0x55, 0x2a, 0xf6, 0x47, 0xbe, 0xad, 0xcf, 0x0c, 0x78, 0xf5, 0x26,
-	0xb2, 0x54, 0x95, 0xde, 0x96, 0x6b, 0x20, 0xd5, 0x95, 0x77, 0x0b, 0xa6, 0x85, 0x8f, 0x7c, 0x70,
-	0xe7, 0x4f, 0x1d, 0xb9, 0xa7, 0x57, 0xbd, 0x88, 0x85, 0xad, 0x74, 0xf0, 0xbd, 0x46, 0xad, 0xd5,
-	0x0e, 0x2f, 0x5f, 0xbd, 0x89, 0x29, 0x1a, 0x9f, 0xd5, 0xd6, 0x6f, 0x73, 0x50, 0x3d, 0xcd, 0x24,
-	0x95, 0x81, 0x4f, 0x0d, 0x28, 0xa9, 0x75, 0x95, 0x3a, 0xad, 0x81, 0xdc, 0x2c, 0x94, 0x7d, 0x1f,
-	0x9d, 0xb5, 0xe3, 0x4c, 0x38, 0xa0, 0xae, 0x09, 0xdb, 0x03, 0x31, 0x91, 0x55, 0xa7, 0x09, 0x46,
-	0xa9, 0x95, 0x9f, 0xc1, 0x72, 0x16, 0x30, 0xdd, 0x39, 0x0a, 0xb2, 0x73, 0xdc, 0x1e, 0xed, 0x1c,
-	0xef, 0x3c, 0x67, 0x0c, 0x13, 0xfb, 0x52, 0xdd, 0xe3, 0x4f, 0x86, 0x18, 0x09, 0xc9, 0x7a, 0x33,
-	0x21, 0x85, 0xef, 0xc1, 0x5a, 0xd7, 0x15, 0x4f, 0x31, 0x46, 0x7c, 0xec, 0xa3, 0xe7, 0x28, 0x4f,
-	0xf4, 0x0a, 0x91, 0xb7, 0x57, 0x38, 0xc0, 0xd6, 0x7c, 0xa5, 0xa0, 0xe1, 0x25, 0xa2, 0x3d, 0x12,
-	0xb5, 0x91, 0xd2, 0x51, 0xd1, 0xdc, 0x50, 0xf4, 0x8e, 0xe6, 0x0f, 0x45, 0x4f, 0xa6, 0x3a, 0x3f,
-	0x9e, 0xea, 0x4f, 0x44, 0x03, 0x9c, 0xec, 0x82, 0x4a, 0x79, 0x13, 0x66, 0x75, 0xf8, 0x85, 0xc9,
-	0x5f, 0x21, 0x88, 0x89, 0x22, 0xeb, 0x11, 0xd4, 0x6e, 0x22, 0xdb, 0xbd, 0x75, 0x77, 0x42, 0xf0,
-	0xee, 0x03, 0xc8, 0x5d, 0x28, 0xec, 0x44, 0xfa, 0x0e, 0x3c, 0xef, 0xd1, 0x7c, 0xf5, 0x11, 0xdd,
-	0x7f, 0x8e, 0xa9, 0xbf, 0xa8, 0xf5, 0x0b, 0x03, 0x2e, 0x4f, 0x38, 0x5c, 0xb9, 0xfd, 0x31, 0x94,
-	0xd2, 0x93, 0x95, 0x8b, 0x6b, 0x23, 0xae, 0xff, 0x0f, 0x46, 0xd8, 0xe9, 0x39, 0xcd, 0x09, 0xd4,
-	0xfa, 0xdc, 0xe0, 0xf3, 0xcf, 0xed, 0xf5, 0xba, 0x03, 0xd1, 0x66, 0xe9, 0xd9, 0x46, 0xce, 0x47,
-	0x60, 0x1e, 0xa9, 0x6e, 0xe9, 0x7c, 0x85, 0xd9, 0x53, 0x3a, 0x3a, 0x49, 0x32, 0xdf, 0x85, 0x69,
-	0x31, 0x07, 0xa8, 0x6a, 0x71, 0xcf, 0xee, 0x96, 0x0a, 0x6f, 0xad, 0xc2, 0x85, 0x13, 0x9e, 0xa8,
-	0x6d, 0xf3, 0x8f, 0x39, 0x58, 0xbb, 0xe1, 0x79, 0x4d, 0x74, 0x49, 0xfb, 0xe0, 0x06, 0x63, 0xc4,
-	0x6f, 0xc5, 0x0c, 0xb5, 0xa3, 0x9f, 0xc0, 0x12, 0x15, 0x1c, 0xc7, 0xd5, 0x2c, 0x15, 0xe2, 0xe6,
-	0x99, 0x7a, 0xc9, 0xa9, 0x9a, 0xeb, 0x27, 0xc8, 0xaa, 0x8d, 0xd0, 0x51, 0xaa, 0x79, 0x05, 0x8a,
-	0x14, 0xdb, 0x31, 0x11, 0x2b, 0xb5, 0x18, 0x27, 0xb2, 0x2b, 0x2e, 0x68, 0xaa, 0x68, 0xa1, 0x95,
-	0x43, 0x58, 0xce, 0xd2, 0x97, 0xb1, 0xa7, 0x7c, 0x3f, 0xdd, 0x6d, 0x8a, 0x5b, 0x57, 0x47, 0x03,
-	0x98, 0x2c, 0xff, 0x8d, 0xd0, 0xc3, 0x87, 0xe8, 0xdd, 0xe7, 0xd0, 0x7b, 0x83, 0x1e, 0xa6, 0xbb,
-	0xcb, 0x25, 0xa8, 0x64, 0xb9, 0xa5, 0xe2, 0x59, 0x86, 0x15, 0xfd, 0xea, 0xdb, 0x91, 0xd7, 0x59,
-	0x79, 0x6c, 0xfd, 0xc3, 0x80, 0xd5, 0x31, 0x96, 0xaa, 0x65, 0x1f, 0xd6, 0x68, 0xdc, 0xeb, 0x45,
-	0x84, 0xa1, 0xe7, 0xb4, 0xbb, 0x7e, 0x6a, 0xd6, 0xeb, 0x3b, 0xfd, 0xed, 0x51, 0x53, 0x15, 0x97,
-	0x1b, 0xdb, 0xd4, 0x92, 0xcd, 0xdd, 0x1f, 0xa8, 0x99, 0x46, 0xed, 0xd5, 0x44, 0xdf, 0x8e, 0x50,
-	0xa7, 0x19, 0x7c, 0x5e, 0x06, 0xc8, 0xdf, 0x97, 0xf4, 0xc0, 0xef, 0xc9, 0x7d, 0x34, 0x37, 0x61,
-	0x5e, 0xaa, 0x9e, 0xc4, 0xcf, 0xb9, 0x9d, 0x88, 0xc9, 0xa7, 0x62, 0x30, 0xf2, 0x6d, 0xfd, 0x21,
-	0x07, 0x2b, 0x36, 0xba, 0xde, 0xee, 0xad, 0xbb, 0x27, 0x1b, 0xc5, 0x1e, 0xbc, 0xc2, 0x06, 0x3d,
-	0x79, 0x55, 0x8a, 0x5b, 0x9b, 0x93, 0x1f, 0x5e, 0xbb, 0xe8, 0x7a, 0xb7, 0x90, 0x31, 0x24, 0x77,
-	0x63, 0x54, 0xe1, 0x17, 0xe2, 0x23, 0xcf, 0xbb, 0xdc, 0xe8, 0xf3, 0x8e, 0x17, 0x4a, 0x14, 0x13,
-	0xfe, 0x06, 0x96, 0x06, 0xab, 0x9e, 0xba, 0x20, 0xa9, 0x2a, 0xde, 0xe6, 0x3b, 0x50, 0xf6, 0x43,
-	0x8e, 0xf0, 0xfb, 0xe8, 0xf0, 0xb5, 0x2a, 0xd5, 0xb2, 0xe5, 0x8e, 0x76, 0x21, 0xe1, 0xef, 0x85,
-	0xa9, 0x8e, 0xfd, 0x4d, 0xbc, 0x5c, 0xfe, 0x6d, 0xc0, 0xea, 0x58, 0xc0, 0x54, 0x41, 0x7c, 0x4d,
-	0x11, 0xcb, 0xec, 0x91, 0xb9, 0xaf, 0xb1, 0x47, 0x66, 0x39, 0x9b, 0xcf, 0x72, 0xf6, 0xef, 0x06,
-	0xac, 0xde, 0x89, 0xc9, 0x3e, 0xbe, 0x8c, 0xe5, 0x61, 0x55, 0xa0, 0x3c, 0xee, 0xdc, 0xb0, 0xc3,
-	0xae, 0xde, 0xc6, 0x97, 0xd4, 0xf3, 0x6f, 0xe4, 0x62, 0x6c, 0x43, 0x79, 0x3c, 0x60, 0xcf, 0xf7,
-	0xc2, 0xb0, 0x3e, 0x35, 0xe0, 0xa2, 0x8d, 0x1d, 0x82, 0xf4, 0x40, 0x8f, 0x56, 0x51, 0xb0, 0x2f,
-	0xf8, 0xf7, 0xd9, 0x2a, 0x5c, 0xca, 0xb6, 0x62, 0x58, 0x1c, 0xaf, 0xda, 0x48, 0x31, 0xf4, 0x4e,
-	0x5c, 0x35, 0x9a, 0xfa, 0xb9, 0x73, 0xf8, 0x03, 0x5f, 0xf2, 0xfb, 0xed, 0x7c, 0x42, 0x6b, 0x78,
-	0xe6, 0x6b, 0x30, 0x9f, 0x2c, 0x1c, 0xaa, 0x02, 0xe6, 0x6c, 0xd0, 0xa4, 0x86, 0x67, 0x5e, 0x80,
-	0x69, 0x12, 0x87, 0xfa, 0xcd, 0x3a, 0x67, 0x17, 0x48, 0x1c, 0xca, 0xda, 0x20, 0x18, 0x44, 0x6c,
-	0x58, 0x1b, 0xf2, 0x37, 0xbd, 0x05, 0x49, 0xd5, 0xb5, 0x31, 0xfe, 0xf2, 0x2d, 0x64, 0xbc, 0x7c,
-	0x5f, 0x87, 0x05, 0x89, 0x1a, 0x7d, 0xa3, 0x4a, 0xd0, 0x69, 0xcf, 0xdd, 0x99, 0xb1, 0xe7, 0xee,
-	0x6b, 0x30, 0xcf, 0x11, 0x5a, 0xc9, 0x6c, 0x02, 0x50, 0x2a, 0xac, 0x1a, 0x54, 0x4f, 0x0b, 0x98,
-	0x8c, 0xe9, 0x76, 0xf7, 0xf1, 0x93, 0xea, 0xd4, 0x17, 0x4f, 0xaa, 0x53, 0x5f, 0x3e, 0xa9, 0x1a,
-	0x3f, 0x3f, 0xae, 0x1a, 0xbf, 0x3b, 0xae, 0x1a, 0x9f, 0x1f, 0x57, 0x8d, 0xc7, 0xc7, 0x55, 0xe3,
-	0x9f, 0xc7, 0x55, 0xe3, 0x5f, 0xc7, 0xd5, 0xa9, 0x2f, 0x8f, 0xab, 0xc6, 0x67, 0x4f, 0xab, 0x53,
-	0x8f, 0x9f, 0x56, 0xa7, 0xbe, 0x78, 0x5a, 0x9d, 0xfa, 0xf1, 0xdb, 0xfb, 0xd1, 0x30, 0xc3, 0x7e,
-	0x34, 0xe1, 0xff, 0x37, 0xdf, 0x4b, 0x7f, 0xb7, 0xa6, 0xc5, 0x3f, 0x05, 0xae, 0xff, 0x37, 0x00,
-	0x00, 0xff, 0xff, 0xe5, 0xc1, 0xb1, 0x68, 0xfa, 0x19, 0x00, 0x00,
+	0x11, 0xd7, 0x92, 0xa1, 0x3e, 0x86, 0x16, 0x25, 0xae, 0xf5, 0x41, 0xd1, 0x0e, 0x43, 0x6f, 0xe2,
+	0x58, 0x0e, 0x5a, 0xaa, 0x92, 0x8b, 0x7c, 0x15, 0x3d, 0x58, 0x1f, 0x71, 0x88, 0xda, 0xad, 0xb3,
+	0x34, 0xec, 0xa0, 0x40, 0xb1, 0x59, 0x72, 0x87, 0xd2, 0x42, 0xdc, 0x5d, 0xf6, 0xbd, 0x47, 0xca,
+	0x74, 0x81, 0xa0, 0x87, 0x14, 0x68, 0xd1, 0x4b, 0x2e, 0xfd, 0x0f, 0x7a, 0xe8, 0xa1, 0x45, 0xff,
+	0x86, 0xb6, 0x97, 0x1c, 0xdd, 0x9e, 0x02, 0x14, 0x05, 0x6a, 0xf9, 0xd2, 0xde, 0x72, 0xea, 0xb9,
+	0x78, 0x5f, 0xcb, 0x25, 0xb9, 0xa2, 0xe5, 0x26, 0x71, 0x81, 0xdc, 0xb4, 0x33, 0xbf, 0x99, 0x37,
+	0x5f, 0x6f, 0x66, 0x1e, 0x05, 0xef, 0x32, 0x0c, 0xba, 0x11, 0x71, 0x3b, 0x5b, 0x14, 0x49, 0x1f,
+	0xc9, 0x96, 0xdb, 0xf5, 0xb7, 0x5c, 0x2f, 0xf0, 0x43, 0xfe, 0xed, 0xb7, 0x70, 0xab, 0xbf, 0xbd,
+	0x45, 0xf0, 0xa7, 0x3d, 0xa4, 0xcc, 0x21, 0x48, 0xbb, 0x51, 0x48, 0xb1, 0xd6, 0x25, 0x11, 0x8b,
+	0xcc, 0x57, 0xb5, 0x6c, 0x4d, 0xca, 0xd6, 0xdc, 0xae, 0x5f, 0x4b, 0xca, 0xd6, 0xfa, 0xdb, 0x65,
+	0x2b, 0x3e, 0x80, 0x6b, 0xc6, 0xb0, 0x17, 0x50, 0xae, 0xb2, 0x15, 0x05, 0x41, 0x14, 0x4a, 0x45,
+	0xe5, 0xd7, 0x46, 0x30, 0x92, 0xc5, 0x41, 0x01, 0x52, 0xea, 0x1e, 0xaa, 0xe3, 0xca, 0x57, 0x47,
+	0x50, 0x7d, 0x24, 0xd4, 0x4f, 0x83, 0x7d, 0x2b, 0xcd, 0xa3, 0x56, 0xa7, 0x47, 0x19, 0x92, 0x49,
+	0xf4, 0xf5, 0x34, 0x74, 0xba, 0x95, 0xd7, 0xa6, 0x42, 0x99, 0x4b, 0x8f, 0x15, 0xb0, 0x96, 0x06,
+	0x0c, 0xdd, 0x00, 0x69, 0xd7, 0x95, 0x01, 0x3d, 0x87, 0xc5, 0x47, 0x3e, 0x65, 0x11, 0x19, 0x4c,
+	0xa2, 0xbf, 0x93, 0x86, 0x26, 0xd8, 0xed, 0xf8, 0x2d, 0x97, 0xa5, 0x45, 0xc4, 0xfa, 0x95, 0x01,
+	0xd5, 0x7d, 0xa4, 0x2d, 0xe2, 0x37, 0xf1, 0x41, 0x44, 0x8e, 0xdb, 0x9d, 0xe8, 0xe4, 0xe0, 0x21,
+	0xb6, 0x7a, 0x1c, 0x6e, 0xcb, 0xdc, 0x9a, 0x97, 0x61, 0x21, 0x36, 0xb1, 0x64, 0x54, 0x8d, 0xcd,
+	0x05, 0x7b, 0x48, 0x30, 0x6f, 0xc1, 0x02, 0x6a, 0x89, 0x52, 0xa6, 0x6a, 0x6c, 0xe6, 0x77, 0xae,
+	0xc7, 0x6e, 0x8a, 0xbc, 0xab, 0x50, 0xf5, 0xb7, 0x6b, 0x93, 0x47, 0x0c, 0x65, 0xad, 0xbf, 0x1a,
+	0x70, 0x65, 0x8a, 0x2d, 0xb2, 0xbe, 0xcc, 0x0d, 0x98, 0xa7, 0x47, 0x2e, 0xf1, 0x1c, 0xdf, 0x53,
+	0xb6, 0xcc, 0x89, 0xef, 0xba, 0x67, 0x5e, 0x81, 0x0b, 0x2a, 0x34, 0x8e, 0xeb, 0x79, 0x44, 0x18,
+	0xb3, 0x60, 0xe7, 0x15, 0xed, 0xa6, 0xe7, 0x11, 0xf3, 0x06, 0xac, 0x05, 0x3d, 0xe6, 0x36, 0x3b,
+	0xe8, 0x50, 0xe6, 0x32, 0x74, 0xfc, 0xd0, 0x69, 0xb9, 0xad, 0x23, 0x2c, 0x65, 0x05, 0xf8, 0xa2,
+	0xe2, 0x36, 0x38, 0xb3, 0x1e, 0xee, 0x71, 0x96, 0xf9, 0x0e, 0x6c, 0x4c, 0x08, 0x79, 0x2e, 0x73,
+	0x9b, 0x2e, 0xc5, 0xd2, 0x4b, 0x42, 0x6e, 0x6d, 0x54, 0x6e, 0x5f, 0x71, 0xad, 0xbf, 0x18, 0x50,
+	0xd6, 0x3e, 0xbd, 0x2f, 0xed, 0x78, 0x3f, 0xa2, 0x4c, 0x47, 0x96, 0x5b, 0x1c, 0x51, 0x26, 0xcc,
+	0x45, 0x4a, 0x95, 0x43, 0x79, 0x4e, 0xbb, 0x29, 0x49, 0xe6, 0x75, 0x28, 0x6a, 0x7f, 0x9d, 0x76,
+	0x44, 0x1c, 0xce, 0x13, 0x9e, 0xe5, 0xec, 0x82, 0x72, 0xfc, 0xbd, 0x88, 0x70, 0xa5, 0xe6, 0x03,
+	0x30, 0xe3, 0x68, 0x0e, 0xb1, 0xd9, 0xe7, 0x4d, 0xc9, 0x72, 0xac, 0x44, 0x29, 0xb6, 0x7e, 0x93,
+	0x81, 0x4b, 0xa9, 0x5e, 0xa8, 0x9c, 0x6c, 0xc2, 0x72, 0xd8, 0x0b, 0x9a, 0x48, 0x9c, 0xa8, 0xed,
+	0x08, 0xa3, 0xa4, 0x2b, 0x39, 0xbb, 0x20, 0xe9, 0x3f, 0x6a, 0x37, 0x04, 0xd5, 0xbc, 0x04, 0x0b,
+	0xda, 0x1b, 0x5a, 0xca, 0x54, 0xb3, 0x9b, 0x39, 0x7b, 0x5e, 0x79, 0x41, 0xcd, 0x9f, 0xc0, 0x52,
+	0x5c, 0x56, 0x89, 0xac, 0xe4, 0x77, 0xbe, 0x5b, 0x4b, 0x6b, 0x27, 0x31, 0x96, 0xbb, 0xf1, 0x43,
+	0xfd, 0x21, 0x52, 0x56, 0x0f, 0xdb, 0x91, 0x5d, 0x08, 0x47, 0x68, 0xe6, 0x9b, 0xb0, 0x2e, 0xcf,
+	0x6e, 0x45, 0x21, 0x23, 0x51, 0xa7, 0x83, 0x44, 0xe4, 0xb3, 0x47, 0x55, 0x12, 0x57, 0x05, 0x7b,
+	0x2f, 0xe6, 0x36, 0x04, 0xd3, 0x2c, 0xc1, 0x9c, 0xce, 0x4f, 0x4e, 0x16, 0x9c, 0xfa, 0xb4, 0x6a,
+	0x50, 0xdc, 0xeb, 0x44, 0x14, 0x85, 0x73, 0x3a, 0xa7, 0xe3, 0x05, 0x9a, 0x8b, 0x0b, 0xd4, 0x5a,
+	0x01, 0x33, 0x89, 0x97, 0xd1, 0xb3, 0xfe, 0x6c, 0x40, 0xd1, 0xc6, 0x20, 0xea, 0xe3, 0x3d, 0x97,
+	0x1e, 0x3f, 0x5b, 0x8d, 0xf9, 0x1e, 0xcc, 0xb7, 0x5c, 0x86, 0x87, 0x11, 0x19, 0x88, 0x4a, 0x28,
+	0xec, 0xbc, 0x91, 0x1a, 0x20, 0xd1, 0x80, 0x78, 0x70, 0xb8, 0xde, 0x3d, 0x25, 0x61, 0xc7, 0xb2,
+	0xe6, 0x3a, 0xcc, 0xf1, 0xd6, 0xc4, 0x4f, 0xe0, 0x71, 0xce, 0xda, 0xb3, 0xfc, 0xb3, 0xee, 0x99,
+	0xdb, 0xb0, 0xd2, 0xf7, 0xa9, 0xdf, 0xf4, 0x3b, 0x3e, 0x1b, 0x38, 0xcc, 0x0f, 0x90, 0x32, 0x37,
+	0xe8, 0x8a, 0x30, 0x65, 0xed, 0x8b, 0x43, 0xde, 0x3d, 0xcd, 0xe2, 0xae, 0x25, 0x7d, 0x50, 0xae,
+	0xfd, 0x3e, 0x03, 0x57, 0x6f, 0x21, 0x9b, 0xac, 0x31, 0xf7, 0x44, 0xd5, 0xd1, 0x8b, 0xed, 0x31,
+	0xe6, 0x6b, 0x50, 0x68, 0xfb, 0x84, 0x32, 0x07, 0xfb, 0x18, 0xb2, 0xa1, 0xe7, 0x17, 0x04, 0xf5,
+	0x80, 0x13, 0xeb, 0x9e, 0x69, 0xc1, 0x62, 0x88, 0x0f, 0x13, 0x20, 0xe9, 0x78, 0x9e, 0x13, 0x35,
+	0xe6, 0x0d, 0x28, 0x06, 0xee, 0x43, 0x3f, 0xe8, 0x05, 0x4e, 0xd7, 0x3d, 0x44, 0x87, 0xfa, 0x8f,
+	0x50, 0xd4, 0x47, 0xce, 0x5e, 0x52, 0x8c, 0xbb, 0xee, 0x21, 0x36, 0xfc, 0x47, 0x68, 0xbe, 0x0e,
+	0x4b, 0x42, 0x9f, 0x00, 0xb2, 0xe8, 0x18, 0xc3, 0xd2, 0x6c, 0xd5, 0xd8, 0xbc, 0x60, 0x8b, 0x63,
+	0x38, 0xec, 0x1e, 0x27, 0x5a, 0x7f, 0xcb, 0xc2, 0xeb, 0xcf, 0x0a, 0x97, 0xba, 0x72, 0x29, 0x2a,
+	0x8d, 0x14, 0x95, 0x66, 0x1d, 0x96, 0x74, 0x4f, 0x6c, 0xba, 0xac, 0x75, 0x84, 0xf2, 0xda, 0xe5,
+	0x77, 0xaa, 0x67, 0xc5, 0x8f, 0xf7, 0xae, 0xdd, 0x4e, 0xd4, 0xb4, 0x0b, 0x4a, 0x70, 0x57, 0xca,
+	0x99, 0xbf, 0x36, 0x60, 0x39, 0x31, 0x4c, 0x1c, 0x3f, 0x6c, 0x47, 0xa5, 0xac, 0x50, 0xf6, 0x51,
+	0xed, 0x1c, 0xf3, 0xbe, 0x76, 0x3e, 0xd7, 0x6a, 0xf6, 0xf0, 0x0c, 0x7e, 0x8f, 0x0f, 0x42, 0x46,
+	0x06, 0xf6, 0x12, 0x19, 0xa5, 0x9a, 0x35, 0xb8, 0x28, 0xd3, 0xc3, 0x85, 0xd1, 0x51, 0x33, 0x5f,
+	0x64, 0x2a, 0x67, 0x17, 0x05, 0xab, 0xc1, 0x39, 0xf7, 0x25, 0xa3, 0x7c, 0x02, 0x2b, 0x69, 0x8a,
+	0xcd, 0x65, 0xc8, 0x1e, 0xe3, 0x40, 0x95, 0x1c, 0xff, 0xd3, 0xac, 0x43, 0xae, 0xef, 0x76, 0x7a,
+	0xa8, 0x0a, 0xed, 0x46, 0xaa, 0x6f, 0x09, 0x73, 0xb8, 0x6b, 0x63, 0xaa, 0x6d, 0xa9, 0xe1, 0xdd,
+	0xcc, 0xdb, 0x86, 0xf5, 0xcb, 0x2c, 0x5c, 0x9b, 0xee, 0xf9, 0xfd, 0x9d, 0x17, 0x7f, 0x0b, 0x28,
+	0x73, 0xc9, 0xe4, 0x2d, 0x10, 0x54, 0x5d, 0xe1, 0x35, 0xb8, 0x98, 0x44, 0x25, 0x23, 0x9c, 0xb5,
+	0x8b, 0x43, 0xa8, 0x8a, 0xb0, 0x59, 0x85, 0x0b, 0x18, 0x7a, 0x43, 0x9d, 0x39, 0x01, 0x04, 0x0c,
+	0xbd, 0xc4, 0x9d, 0x19, 0x22, 0xb4, 0xbe, 0x59, 0x01, 0x5b, 0xd2, 0x30, 0xad, 0x2d, 0xf5, 0x7e,
+	0xcd, 0x9d, 0xfb, 0x7e, 0xcd, 0xa7, 0xdd, 0xaf, 0xff, 0x18, 0xb0, 0xf9, 0xec, 0x54, 0xfc, 0xff,
+	0x6e, 0xd8, 0x03, 0x58, 0x52, 0x51, 0x71, 0x14, 0x47, 0x0d, 0xc0, 0x5a, 0x6a, 0x0d, 0x2a, 0x0c,
+	0x57, 0xa9, 0xa2, 0xa6, 0xaf, 0x52, 0xa1, 0x3f, 0xf2, 0x6d, 0x7d, 0x6a, 0xc0, 0xcb, 0xb7, 0x90,
+	0x25, 0xaa, 0xf4, 0x8e, 0x5c, 0x03, 0xa9, 0xae, 0xbc, 0xdb, 0x30, 0x2b, 0x7c, 0xe4, 0x83, 0x3b,
+	0x7b, 0xe6, 0xc8, 0x3d, 0xbb, 0xea, 0x45, 0x2c, 0x6c, 0xa5, 0x83, 0xef, 0x35, 0x6a, 0xad, 0x76,
+	0x78, 0xf9, 0xea, 0x4d, 0x4c, 0xd1, 0xf8, 0xac, 0xb6, 0x7e, 0x9b, 0x81, 0xca, 0x59, 0x26, 0xa9,
+	0x0c, 0x7c, 0x62, 0x40, 0x51, 0xad, 0xab, 0xd4, 0x69, 0x0e, 0xe4, 0x66, 0xa1, 0xec, 0xfb, 0xf0,
+	0xbc, 0x1d, 0x67, 0xca, 0x01, 0x35, 0x4d, 0xd8, 0x1d, 0x88, 0x89, 0xac, 0x3a, 0x4d, 0x30, 0x4a,
+	0x2d, 0xff, 0x0c, 0x56, 0xd2, 0x80, 0xc9, 0xce, 0x91, 0x93, 0x9d, 0xe3, 0xce, 0x68, 0xe7, 0x78,
+	0xeb, 0x39, 0x63, 0x18, 0xdb, 0x97, 0xe8, 0x1e, 0x7f, 0x32, 0xc4, 0x48, 0x88, 0xd7, 0x9b, 0x29,
+	0x29, 0x7c, 0x07, 0x36, 0x3a, 0xae, 0x78, 0x8a, 0x31, 0xe2, 0x63, 0x1f, 0x3d, 0x47, 0x79, 0xa2,
+	0x57, 0x88, 0xac, 0xbd, 0xc6, 0x01, 0xb6, 0xe6, 0x2b, 0x05, 0x75, 0x2f, 0x16, 0xed, 0x92, 0xa8,
+	0x85, 0x94, 0x8e, 0x8a, 0x66, 0x86, 0xa2, 0x77, 0x35, 0x7f, 0x28, 0x3a, 0x9e, 0xea, 0xec, 0x64,
+	0xaa, 0x3f, 0x16, 0x0d, 0x70, 0xba, 0x0b, 0x2a, 0xe5, 0x0d, 0x98, 0xd7, 0xe1, 0x17, 0x26, 0x7f,
+	0x89, 0x20, 0xc6, 0x8a, 0xac, 0x47, 0x50, 0xbd, 0x85, 0x6c, 0xff, 0xf6, 0x07, 0x53, 0x82, 0x77,
+	0x1f, 0x40, 0xee, 0x42, 0x61, 0x3b, 0xd2, 0x77, 0xe0, 0x79, 0x8f, 0xe6, 0xab, 0x8f, 0xe8, 0xfe,
+	0x0b, 0x4c, 0xfd, 0x45, 0xad, 0x5f, 0x18, 0x70, 0x65, 0xca, 0xe1, 0xca, 0xed, 0x8f, 0xa0, 0x98,
+	0x9c, 0xac, 0x5c, 0x5c, 0x1b, 0x71, 0xe3, 0x7f, 0x30, 0xc2, 0x4e, 0xce, 0x69, 0x4e, 0xa0, 0xd6,
+	0x67, 0x06, 0x9f, 0x7f, 0x6e, 0xb7, 0xdb, 0x19, 0x88, 0x36, 0x4b, 0xcf, 0x37, 0x72, 0x3e, 0x04,
+	0xf3, 0x44, 0x75, 0x4b, 0xe7, 0x4b, 0xcc, 0x9e, 0xe2, 0xc9, 0x38, 0xc9, 0x7c, 0x1b, 0x66, 0xc5,
+	0x1c, 0xa0, 0xaa, 0xc5, 0x3d, 0xbb, 0x5b, 0x2a, 0xbc, 0xb5, 0x0e, 0xab, 0x63, 0x9e, 0xa8, 0x6d,
+	0xf3, 0x8f, 0x19, 0xd8, 0xb8, 0xe9, 0x79, 0x0d, 0x74, 0x49, 0xeb, 0xe8, 0x26, 0x63, 0xc4, 0x6f,
+	0xf6, 0x18, 0x6a, 0x47, 0x3f, 0x86, 0x65, 0x2a, 0x38, 0x8e, 0xab, 0x59, 0x2a, 0xc4, 0x8d, 0x73,
+	0xf5, 0x92, 0x33, 0x35, 0xd7, 0xc6, 0xc8, 0xaa, 0x8d, 0xd0, 0x51, 0xaa, 0x79, 0x15, 0x0a, 0x14,
+	0x5b, 0x3d, 0x22, 0x56, 0x6a, 0x31, 0x4e, 0x64, 0x57, 0x5c, 0xd4, 0x54, 0xd1, 0x42, 0xcb, 0xc7,
+	0xb0, 0x92, 0xa6, 0x2f, 0x65, 0x4f, 0xf9, 0x7e, 0xb2, 0xdb, 0x14, 0x76, 0xae, 0x8d, 0x06, 0x30,
+	0x5e, 0xfe, 0xeb, 0xa1, 0x87, 0x0f, 0xd1, 0xbb, 0xcf, 0xa1, 0xf7, 0x06, 0x5d, 0x4c, 0x76, 0x97,
+	0xcb, 0x50, 0x4e, 0x73, 0x4b, 0xc5, 0xb3, 0x04, 0x6b, 0xfa, 0xd5, 0xb7, 0x27, 0xaf, 0xb3, 0xf2,
+	0xd8, 0xfa, 0x87, 0x01, 0xeb, 0x13, 0x2c, 0x55, 0xcb, 0x3e, 0x6c, 0xd0, 0x5e, 0xb7, 0x1b, 0x11,
+	0x86, 0x9e, 0xd3, 0xea, 0xf8, 0x89, 0x59, 0xaf, 0xef, 0xf4, 0xb7, 0x47, 0x4d, 0x55, 0x5c, 0x6e,
+	0x6c, 0x43, 0x4b, 0x36, 0xf6, 0x7f, 0xa0, 0x66, 0x1a, 0xb5, 0xd7, 0x63, 0x7d, 0x7b, 0x42, 0x9d,
+	0x66, 0xf0, 0x79, 0x19, 0x20, 0x7f, 0x5f, 0xd2, 0x23, 0xbf, 0x2b, 0xf7, 0xd1, 0xcc, 0x94, 0x79,
+	0xa9, 0x7a, 0x12, 0x3f, 0xe7, 0x4e, 0x2c, 0x26, 0x9f, 0x8a, 0xc1, 0xc8, 0xb7, 0xf5, 0x87, 0x0c,
+	0xac, 0xca, 0x5b, 0x3b, 0xde, 0x27, 0x0e, 0xe0, 0x25, 0x36, 0xe8, 0xca, 0x9b, 0x52, 0xd8, 0xd9,
+	0x9e, 0xfe, 0xee, 0xda, 0x47, 0xd7, 0xbb, 0x8d, 0x8c, 0x21, 0xf9, 0xa0, 0x87, 0x2a, 0xfa, 0x42,
+	0x7c, 0xe4, 0x75, 0x97, 0x19, 0x7d, 0xdd, 0xf1, 0x3a, 0x89, 0x7a, 0x84, 0x3f, 0x81, 0xa5, 0xbd,
+	0xaa, 0xa5, 0x2e, 0x4a, 0xaa, 0x0a, 0xb7, 0xf9, 0x16, 0x94, 0xfc, 0x90, 0x23, 0xfc, 0x3e, 0x3a,
+	0x7c, 0xab, 0x4a, 0x74, 0x6c, 0xb9, 0xa2, 0xad, 0xc6, 0xfc, 0x83, 0x30, 0xd1, 0xb0, 0xbf, 0x8e,
+	0x87, 0xcb, 0xbf, 0x0d, 0x58, 0x1b, 0x8f, 0x97, 0x2a, 0x87, 0xaf, 0x28, 0x60, 0xa9, 0x1d, 0x32,
+	0xf3, 0x15, 0x76, 0xc8, 0x34, 0x5f, 0xb3, 0x69, 0xbe, 0xfe, 0xdd, 0x80, 0xf5, 0xbb, 0x3d, 0x72,
+	0x88, 0xdf, 0xc4, 0xea, 0xb0, 0xca, 0x50, 0x9a, 0x74, 0x6e, 0xd8, 0x5f, 0xd7, 0xef, 0xe0, 0x37,
+	0xd4, 0xf3, 0xaf, 0xe5, 0x5e, 0xec, 0x42, 0x69, 0x32, 0x60, 0xcf, 0xf7, 0xbe, 0xb0, 0x3e, 0x31,
+	0xe0, 0x92, 0x8d, 0x6d, 0x82, 0xf4, 0x48, 0x0f, 0x56, 0x51, 0xb0, 0x2f, 0xf8, 0xd7, 0xd9, 0x0a,
+	0x5c, 0x4e, 0xb7, 0x62, 0x58, 0x1c, 0x2f, 0xdb, 0x48, 0x31, 0xf4, 0xc6, 0xae, 0x1a, 0x4d, 0xfc,
+	0xd8, 0x39, 0xfc, 0x79, 0x2f, 0xfe, 0xf5, 0x36, 0x1f, 0xd3, 0xea, 0x9e, 0xf9, 0x0a, 0xe4, 0xe3,
+	0x75, 0x43, 0x55, 0xc0, 0x82, 0x0d, 0x9a, 0x54, 0xf7, 0xcc, 0x55, 0x98, 0x25, 0xbd, 0x50, 0xbf,
+	0x58, 0x17, 0xec, 0x1c, 0xe9, 0x85, 0xb2, 0x36, 0x08, 0x06, 0x11, 0x1b, 0xd6, 0x86, 0xfc, 0x45,
+	0x6f, 0x51, 0x52, 0x75, 0x6d, 0x4c, 0xbe, 0x7b, 0x73, 0x29, 0xef, 0xde, 0x57, 0x61, 0x51, 0xa2,
+	0x46, 0x5f, 0xa8, 0x12, 0x74, 0xd6, 0x63, 0x77, 0x6e, 0xe2, 0xb1, 0xfb, 0x0a, 0xe4, 0x39, 0x42,
+	0x2b, 0x99, 0x8f, 0x01, 0x4a, 0x85, 0x55, 0x85, 0xca, 0x59, 0x01, 0x93, 0x31, 0xdd, 0xed, 0x3c,
+	0x7e, 0x52, 0x99, 0xf9, 0xfc, 0x49, 0x65, 0xe6, 0x8b, 0x27, 0x15, 0xe3, 0xe7, 0xa7, 0x15, 0xe3,
+	0x77, 0xa7, 0x15, 0xe3, 0xb3, 0xd3, 0x8a, 0xf1, 0xf8, 0xb4, 0x62, 0xfc, 0xf3, 0xb4, 0x62, 0xfc,
+	0xeb, 0xb4, 0x32, 0xf3, 0xc5, 0x69, 0xc5, 0xf8, 0xf4, 0x69, 0x65, 0xe6, 0xf1, 0xd3, 0xca, 0xcc,
+	0xe7, 0x4f, 0x2b, 0x33, 0x3f, 0x7e, 0xf3, 0x30, 0x1a, 0x66, 0xd8, 0x8f, 0xa6, 0xfc, 0xf7, 0xe6,
+	0x7b, 0xc9, 0xef, 0xe6, 0xac, 0xf8, 0x97, 0xc0, 0x8d, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x19,
+	0x0c, 0x60, 0x3c, 0xf8, 0x19, 0x00, 0x00,
 }
 
 func (this *DescribeWorkflowExecutionRequest) Equal(that interface{}) bool {
@@ -2818,14 +2818,14 @@ func (this *DescribeClusterResponse) Equal(that interface{}) bool {
 	}
 	return true
 }
-func (this *ReadDLQMessagesRequest) Equal(that interface{}) bool {
+func (this *GetDLQMessagesRequest) Equal(that interface{}) bool {
 	if that == nil {
 		return this == nil
 	}
 
-	that1, ok := that.(*ReadDLQMessagesRequest)
+	that1, ok := that.(*GetDLQMessagesRequest)
 	if !ok {
-		that2, ok := that.(ReadDLQMessagesRequest)
+		that2, ok := that.(GetDLQMessagesRequest)
 		if ok {
 			that1 = &that2
 		} else {
@@ -2857,14 +2857,14 @@ func (this *ReadDLQMessagesRequest) Equal(that interface{}) bool {
 	}
 	return true
 }
-func (this *ReadDLQMessagesResponse) Equal(that interface{}) bool {
+func (this *GetDLQMessagesResponse) Equal(that interface{}) bool {
 	if that == nil {
 		return this == nil
 	}
 
-	that1, ok := that.(*ReadDLQMessagesResponse)
+	that1, ok := that.(*GetDLQMessagesResponse)
 	if !ok {
-		that2, ok := that.(ReadDLQMessagesResponse)
+		that2, ok := that.(GetDLQMessagesResponse)
 		if ok {
 			that1 = &that2
 		} else {
@@ -3463,12 +3463,12 @@ func (this *DescribeClusterResponse) GoString() string {
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
-func (this *ReadDLQMessagesRequest) GoString() string {
+func (this *GetDLQMessagesRequest) GoString() string {
 	if this == nil {
 		return "nil"
 	}
 	s := make([]string, 0, 10)
-	s = append(s, "&adminservice.ReadDLQMessagesRequest{")
+	s = append(s, "&adminservice.GetDLQMessagesRequest{")
 	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
 	s = append(s, "ShardId: "+fmt.Sprintf("%#v", this.ShardId)+",\n")
 	s = append(s, "SourceCluster: "+fmt.Sprintf("%#v", this.SourceCluster)+",\n")
@@ -3478,12 +3478,12 @@ func (this *ReadDLQMessagesRequest) GoString() string {
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
-func (this *ReadDLQMessagesResponse) GoString() string {
+func (this *GetDLQMessagesResponse) GoString() string {
 	if this == nil {
 		return "nil"
 	}
 	s := make([]string, 0, 7)
-	s = append(s, "&adminservice.ReadDLQMessagesResponse{")
+	s = append(s, "&adminservice.GetDLQMessagesResponse{")
 	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
 	if this.ReplicationTasks != nil {
 		s = append(s, "ReplicationTasks: "+fmt.Sprintf("%#v", this.ReplicationTasks)+",\n")
@@ -4651,7 +4651,7 @@ func (m *DescribeClusterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *ReadDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
+func (m *GetDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -4661,12 +4661,12 @@ func (m *ReadDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ReadDLQMessagesRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ReadDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -4708,7 +4708,7 @@ func (m *ReadDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *ReadDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
+func (m *GetDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -4718,12 +4718,12 @@ func (m *ReadDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ReadDLQMessagesResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ReadDLQMessagesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -5539,7 +5539,7 @@ func (m *DescribeClusterResponse) Size() (n int) {
 	return n
 }
 
-func (m *ReadDLQMessagesRequest) Size() (n int) {
+func (m *GetDLQMessagesRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -5568,7 +5568,7 @@ func (m *ReadDLQMessagesRequest) Size() (n int) {
 	return n
 }
 
-func (m *ReadDLQMessagesResponse) Size() (n int) {
+func (m *GetDLQMessagesResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -6068,11 +6068,11 @@ func (this *DescribeClusterResponse) String() string {
 	}, "")
 	return s
 }
-func (this *ReadDLQMessagesRequest) String() string {
+func (this *GetDLQMessagesRequest) String() string {
 	if this == nil {
 		return "nil"
 	}
-	s := strings.Join([]string{`&ReadDLQMessagesRequest{`,
+	s := strings.Join([]string{`&GetDLQMessagesRequest{`,
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
 		`ShardId:` + fmt.Sprintf("%v", this.ShardId) + `,`,
 		`SourceCluster:` + fmt.Sprintf("%v", this.SourceCluster) + `,`,
@@ -6083,7 +6083,7 @@ func (this *ReadDLQMessagesRequest) String() string {
 	}, "")
 	return s
 }
-func (this *ReadDLQMessagesResponse) String() string {
+func (this *GetDLQMessagesResponse) String() string {
 	if this == nil {
 		return "nil"
 	}
@@ -6092,7 +6092,7 @@ func (this *ReadDLQMessagesResponse) String() string {
 		repeatedStringForReplicationTasks += strings.Replace(fmt.Sprintf("%v", f), "ReplicationTask", "v13.ReplicationTask", 1) + ","
 	}
 	repeatedStringForReplicationTasks += "}"
-	s := strings.Join([]string{`&ReadDLQMessagesResponse{`,
+	s := strings.Join([]string{`&GetDLQMessagesResponse{`,
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
 		`ReplicationTasks:` + repeatedStringForReplicationTasks + `,`,
 		`NextPageToken:` + fmt.Sprintf("%v", this.NextPageToken) + `,`,
@@ -9398,7 +9398,7 @@ func (m *DescribeClusterResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
+func (m *GetDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -9421,10 +9421,10 @@ func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ReadDLQMessagesRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: GetDLQMessagesRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ReadDLQMessagesRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: GetDLQMessagesRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -9593,7 +9593,7 @@ func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ReadDLQMessagesResponse) Unmarshal(dAtA []byte) error {
+func (m *GetDLQMessagesResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -9616,10 +9616,10 @@ func (m *ReadDLQMessagesResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ReadDLQMessagesResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: GetDLQMessagesResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ReadDLQMessagesResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: GetDLQMessagesResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
diff --git a/api/adminservice/v1/service.pb.go b/api/adminservice/v1/service.pb.go
index 0f3db41787e..48b733ed62b 100644
--- a/api/adminservice/v1/service.pb.go
+++ b/api/adminservice/v1/service.pb.go
@@ -30,48 +30,48 @@ func init() {
 }
 
 var fileDescriptor_cf5ca5e0c737570d = []byte{
-	// 649 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xbf, 0x6f, 0x13, 0x31,
-	0x14, 0xc7, 0xcf, 0x0b, 0x83, 0x05, 0x02, 0x99, 0x1f, 0x12, 0x1d, 0x0c, 0x82, 0xfd, 0xa2, 0x16,
-	0xa9, 0x88, 0x16, 0x68, 0xd3, 0x36, 0xa4, 0x82, 0x14, 0xd1, 0x2b, 0x2a, 0x12, 0x0b, 0x72, 0xef,
-	0x5e, 0xdb, 0x53, 0x2f, 0xf1, 0x61, 0x3b, 0x29, 0x9d, 0x60, 0x64, 0x42, 0x30, 0x21, 0x21, 0x31,
-	0xb1, 0x80, 0xc4, 0x7f, 0x80, 0x84, 0xc4, 0xc6, 0xd8, 0xb1, 0x23, 0xb9, 0x2c, 0x8c, 0xfd, 0x13,
-	0x50, 0x48, 0xec, 0x5c, 0x9a, 0x34, 0xf2, 0x5d, 0xb2, 0xe5, 0xa4, 0xf7, 0xf9, 0xbe, 0x8f, 0xcf,
-	0xb9, 0x67, 0xe3, 0x69, 0x05, 0xd5, 0x98, 0x0b, 0x16, 0x15, 0x24, 0x88, 0x06, 0x88, 0x02, 0x8b,
-	0xc3, 0x02, 0x0b, 0xaa, 0x61, 0xad, 0xfd, 0x1c, 0xfa, 0x50, 0x68, 0x4c, 0x17, 0xba, 0x3f, 0xdd,
-	0x58, 0x70, 0xc5, 0xc9, 0x4d, 0x8d, 0xb8, 0x1d, 0xc4, 0x65, 0x71, 0xe8, 0xa6, 0x11, 0xb7, 0x31,
-	0x3d, 0x35, 0x67, 0x93, 0x2b, 0xe0, 0x65, 0x1d, 0xa4, 0x7a, 0x21, 0x40, 0xc6, 0xbc, 0x26, 0xbb,
-	0x0d, 0x66, 0xbe, 0x5d, 0xc6, 0x67, 0x8b, 0xed, 0xd2, 0x8d, 0x4e, 0x29, 0xf9, 0x8e, 0xf0, 0xd5,
-	0x15, 0x90, 0xbe, 0x08, 0xb7, 0xe0, 0x19, 0x17, 0x7b, 0xdb, 0x11, 0xdf, 0x2f, 0xbd, 0x02, 0xbf,
-	0xae, 0x42, 0x5e, 0x23, 0x25, 0xd7, 0x42, 0xc8, 0x3d, 0x95, 0xf7, 0x3a, 0x12, 0x53, 0x0f, 0xc6,
-	0x8d, 0xe9, 0xac, 0xe1, 0x86, 0x43, 0x3e, 0x21, 0x7c, 0x51, 0xd7, 0xad, 0x86, 0x52, 0x71, 0x71,
-	0xb0, 0xca, 0xa5, 0x22, 0x0b, 0x99, 0x3a, 0xa4, 0x48, 0xad, 0xb8, 0x98, 0x3f, 0xc0, 0xc8, 0xbd,
-	0xc6, 0x78, 0x39, 0xe2, 0x12, 0x36, 0x76, 0x99, 0x08, 0xc8, 0xac, 0x55, 0x62, 0x0f, 0xd0, 0x26,
-	0xb7, 0x33, 0x73, 0x69, 0x01, 0x0f, 0xaa, 0xbc, 0x01, 0x4f, 0x99, 0xdc, 0xb3, 0x14, 0xe8, 0x01,
-	0xd9, 0x04, 0xd2, 0x9c, 0x11, 0xf8, 0x81, 0x30, 0x2d, 0x83, 0x1a, 0xdc, 0x41, 0xb6, 0xdf, 0x7d,
-	0x65, 0xe4, 0xa1, 0x55, 0xfa, 0xe8, 0x10, 0x6d, 0xfa, 0x68, 0x22, 0x59, 0xc6, 0xfe, 0x17, 0xc2,
-	0xd7, 0x47, 0x17, 0x6f, 0xce, 0x90, 0xca, 0x04, 0x7a, 0x6e, 0xce, 0xe8, 0x15, 0xac, 0x4d, 0x28,
-	0xcd, 0xac, 0xe1, 0x0b, 0xc2, 0x57, 0xca, 0xa0, 0x3c, 0x88, 0xa3, 0xd0, 0x67, 0xed, 0xc2, 0x35,
-	0x90, 0x92, 0xed, 0x80, 0x24, 0x4b, 0xb6, 0xbd, 0x86, 0xc0, 0xda, 0x77, 0x79, 0xac, 0x0c, 0x63,
-	0xf9, 0x13, 0xe1, 0x6b, 0x65, 0x50, 0x8f, 0x59, 0x15, 0x64, 0xcc, 0x7c, 0x18, 0xa6, 0x6b, 0xbd,
-	0xb9, 0xa3, 0x52, 0xb4, 0x77, 0x65, 0x32, 0x61, 0x66, 0x01, 0xed, 0xb1, 0x59, 0x06, 0xb5, 0x52,
-	0x59, 0x1f, 0xa6, 0x5e, 0xb2, 0xed, 0x36, 0x9c, 0xcf, 0x36, 0x36, 0x47, 0xc4, 0x18, 0xdd, 0xb7,
-	0x08, 0x9f, 0xf3, 0x80, 0xc5, 0x71, 0x74, 0x50, 0x6a, 0x40, 0x4d, 0x49, 0x72, 0xc7, 0xf2, 0x23,
-	0x4f, 0x31, 0x5a, 0x6b, 0x2e, 0x0f, 0x6a, 0x54, 0x3e, 0x22, 0x4c, 0x8a, 0x41, 0xb0, 0x01, 0x4c,
-	0xf8, 0xbb, 0x45, 0xa5, 0x44, 0xb8, 0x55, 0x57, 0x40, 0xee, 0x5b, 0x85, 0x0e, 0x82, 0x5a, 0x6a,
-	0x21, 0x37, 0x6f, 0xcc, 0xde, 0x21, 0x7c, 0x5e, 0x0f, 0xf8, 0xe5, 0xa8, 0x2e, 0x15, 0x08, 0x32,
-	0x9f, 0xe9, 0x58, 0xe8, 0x52, 0xda, 0xe9, 0x6e, 0x3e, 0xb8, 0x4f, 0xc8, 0x03, 0x16, 0xac, 0x54,
-	0xd6, 0xcd, 0x5f, 0x6b, 0xde, 0xf6, 0xe5, 0xa7, 0xa9, 0x6c, 0x42, 0x03, 0xb0, 0x11, 0xfa, 0x80,
-	0xf0, 0x85, 0x27, 0x75, 0xb1, 0x03, 0x69, 0x23, 0xbb, 0xd0, 0x93, 0x98, 0x56, 0xba, 0x97, 0x93,
-	0xee, 0x73, 0x5a, 0x83, 0x5c, 0x4e, 0x27, 0xb1, 0x6c, 0x4e, 0x83, 0xb4, 0x71, 0xfa, 0x8c, 0xf0,
-	0x25, 0x0f, 0xb6, 0x05, 0xc8, 0x5d, 0x3d, 0xb7, 0xdb, 0x07, 0xa5, 0x24, 0x8b, 0x96, 0x1b, 0x30,
-	0x88, 0x6a, 0xb7, 0xe2, 0x18, 0x09, 0x7d, 0x87, 0x84, 0x07, 0x12, 0x6a, 0x41, 0x6a, 0x6c, 0x74,
-	0x0c, 0x97, 0x2c, 0xf3, 0x87, 0xc1, 0xd9, 0x0e, 0x89, 0xd3, 0x32, 0xb4, 0xe5, 0x52, 0x74, 0xd8,
-	0xa4, 0xce, 0x51, 0x93, 0x3a, 0xc7, 0x4d, 0x8a, 0xde, 0x24, 0x14, 0x7d, 0x4d, 0x28, 0xfa, 0x9d,
-	0x50, 0x74, 0x98, 0x50, 0xf4, 0x27, 0xa1, 0xe8, 0x6f, 0x42, 0x9d, 0xe3, 0x84, 0xa2, 0xf7, 0x2d,
-	0xea, 0x1c, 0xb6, 0xa8, 0x73, 0xd4, 0xa2, 0xce, 0xf3, 0xd9, 0x1d, 0xde, 0x6b, 0x1f, 0xf2, 0x11,
-	0x77, 0xe4, 0xf9, 0xf4, 0xf3, 0xd6, 0x99, 0xff, 0x17, 0xe4, 0x5b, 0xff, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0xf7, 0x6b, 0xce, 0xc9, 0xb6, 0x0b, 0x00, 0x00,
+	// 653 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x6b, 0x13, 0x4f,
+	0x18, 0xc7, 0x77, 0x2e, 0xbf, 0xc3, 0xf0, 0xf3, 0x0f, 0xe3, 0x1f, 0xb0, 0x87, 0x51, 0xf4, 0xbe,
+	0xa1, 0x15, 0x2a, 0xb6, 0x6a, 0x9b, 0xb6, 0x31, 0x45, 0x5b, 0xd1, 0xad, 0x54, 0xf0, 0x22, 0xd3,
+	0xcd, 0xd3, 0x76, 0xe9, 0x26, 0xb3, 0xce, 0x4c, 0x52, 0x7b, 0xd2, 0xa3, 0x20, 0x88, 0x9e, 0x04,
+	0xc1, 0x93, 0x20, 0x1e, 0x7c, 0x07, 0x82, 0xe0, 0xcd, 0x63, 0x8e, 0x3d, 0x9a, 0xcd, 0xc5, 0x63,
+	0x5f, 0x82, 0xc4, 0xcd, 0x4c, 0xb6, 0x49, 0x1a, 0x66, 0x37, 0xb9, 0x65, 0x61, 0x3e, 0xdf, 0xe7,
+	0xf3, 0x64, 0x66, 0x9f, 0x59, 0x3c, 0xad, 0xa0, 0x1a, 0x71, 0xc1, 0xc2, 0x82, 0x04, 0xd1, 0x00,
+	0x51, 0x60, 0x51, 0x50, 0x60, 0x95, 0x6a, 0x50, 0xeb, 0x3c, 0x07, 0x3e, 0x14, 0x1a, 0xd3, 0x85,
+	0xee, 0x4f, 0x37, 0x12, 0x5c, 0x71, 0x72, 0x4d, 0x23, 0x6e, 0x82, 0xb8, 0x2c, 0x0a, 0xdc, 0x34,
+	0xe2, 0x36, 0xa6, 0xa7, 0xe6, 0x6c, 0x72, 0x05, 0x3c, 0xaf, 0x83, 0x54, 0xcf, 0x04, 0xc8, 0x88,
+	0xd7, 0x64, 0xb7, 0xc0, 0xcc, 0x97, 0x0b, 0xf8, 0xff, 0x62, 0x67, 0xe9, 0x46, 0xb2, 0x94, 0x7c,
+	0x43, 0xf8, 0xd2, 0x0a, 0x48, 0x5f, 0x04, 0x5b, 0xf0, 0x84, 0x8b, 0xbd, 0xed, 0x90, 0xef, 0x97,
+	0x5e, 0x80, 0x5f, 0x57, 0x01, 0xaf, 0x91, 0x92, 0x6b, 0x21, 0xe4, 0x9e, 0xc8, 0x7b, 0x89, 0xc4,
+	0xd4, 0xdd, 0x71, 0x63, 0x92, 0x1e, 0xae, 0x3a, 0xe4, 0x23, 0xc2, 0xe7, 0xf4, 0xba, 0xd5, 0x40,
+	0x2a, 0x2e, 0x0e, 0x56, 0xb9, 0x54, 0x64, 0x21, 0x53, 0x85, 0x14, 0xa9, 0x15, 0x17, 0xf3, 0x07,
+	0x18, 0xb9, 0x97, 0x18, 0x2f, 0x87, 0x5c, 0xc2, 0xc6, 0x2e, 0x13, 0x15, 0x32, 0x6b, 0x95, 0xd8,
+	0x03, 0xb4, 0xc9, 0x8d, 0xcc, 0x5c, 0x5a, 0xc0, 0x83, 0x2a, 0x6f, 0xc0, 0x63, 0x26, 0xf7, 0x2c,
+	0x05, 0x7a, 0x40, 0x36, 0x81, 0x34, 0x67, 0x04, 0xbe, 0x23, 0x4c, 0xcb, 0xa0, 0x06, 0x77, 0x90,
+	0xed, 0x77, 0xff, 0x32, 0x72, 0xcf, 0x2a, 0x7d, 0x74, 0x88, 0x36, 0xbd, 0x3f, 0x91, 0x2c, 0x63,
+	0xff, 0x13, 0xe1, 0x2b, 0xa3, 0x17, 0x6f, 0xce, 0x90, 0xb5, 0x09, 0xd4, 0xdc, 0x9c, 0xd1, 0x1d,
+	0xac, 0x4f, 0x28, 0xcd, 0xf4, 0xf0, 0x19, 0xe1, 0x8b, 0x65, 0x50, 0x1e, 0x44, 0x61, 0xe0, 0xb3,
+	0xce, 0xc2, 0x75, 0x90, 0x92, 0xed, 0x80, 0x24, 0x4b, 0xb6, 0xb5, 0x86, 0xc0, 0xda, 0x77, 0x79,
+	0xac, 0x0c, 0x63, 0xf9, 0x03, 0xe1, 0xcb, 0x65, 0x50, 0x0f, 0x58, 0x15, 0x64, 0xc4, 0x7c, 0x18,
+	0xa6, 0x6b, 0xbd, 0xb9, 0xa3, 0x52, 0xb4, 0xf7, 0xda, 0x64, 0xc2, 0x4c, 0x03, 0x9d, 0xb1, 0x59,
+	0x06, 0xb5, 0xb2, 0xf6, 0x68, 0x98, 0x7a, 0xc9, 0xb6, 0xda, 0x70, 0x3e, 0xdb, 0xd8, 0x1c, 0x11,
+	0x63, 0x74, 0x5f, 0x23, 0x7c, 0xca, 0x03, 0x16, 0x45, 0xe1, 0x41, 0xa9, 0x01, 0x35, 0x25, 0xc9,
+	0x4d, 0xcb, 0x97, 0x3c, 0xc5, 0x68, 0xad, 0xb9, 0x3c, 0xa8, 0x51, 0xf9, 0x80, 0x30, 0x29, 0x56,
+	0x2a, 0x1b, 0xc0, 0x84, 0xbf, 0x5b, 0x54, 0x4a, 0x04, 0x5b, 0x75, 0x05, 0xe4, 0x8e, 0x55, 0xe8,
+	0x20, 0xa8, 0xa5, 0x16, 0x72, 0xf3, 0xc6, 0xec, 0x2d, 0xc2, 0x67, 0xf4, 0x80, 0x5f, 0x0e, 0xeb,
+	0x52, 0x81, 0x20, 0xf3, 0x99, 0xae, 0x85, 0x2e, 0xa5, 0x9d, 0x6e, 0xe5, 0x83, 0x8d, 0xd0, 0x1b,
+	0x84, 0x4f, 0x27, 0xbb, 0x6b, 0x4e, 0xd6, 0x5c, 0x86, 0x23, 0xd1, 0x7f, 0x9c, 0xe6, 0x73, 0xb1,
+	0xc6, 0xe6, 0x3d, 0xc2, 0x67, 0x1f, 0xd6, 0xc5, 0x0e, 0xa4, 0x7d, 0xec, 0x5a, 0xec, 0xc7, 0xb4,
+	0xd1, 0xed, 0x9c, 0xf4, 0x31, 0xa7, 0x75, 0xc8, 0xe5, 0xd4, 0x8f, 0x65, 0x73, 0x1a, 0xa4, 0x8d,
+	0xd3, 0x27, 0x84, 0xcf, 0x7b, 0xb0, 0x2d, 0x40, 0xee, 0xea, 0xa1, 0xdd, 0xb9, 0x25, 0x25, 0x59,
+	0xb4, 0x7c, 0x6f, 0x06, 0x51, 0xed, 0x56, 0x1c, 0x23, 0xe1, 0xd8, 0x0d, 0xe1, 0x81, 0x84, 0x5a,
+	0x25, 0x35, 0x33, 0x12, 0xc3, 0x25, 0xcb, 0xfc, 0x61, 0x70, 0xb6, 0x1b, 0xe2, 0xa4, 0x0c, 0x6d,
+	0xb9, 0x14, 0x36, 0x5b, 0xd4, 0x39, 0x6c, 0x51, 0xe7, 0xa8, 0x45, 0xd1, 0xab, 0x98, 0xa2, 0xaf,
+	0x31, 0x45, 0xbf, 0x62, 0x8a, 0x9a, 0x31, 0x45, 0xbf, 0x63, 0x8a, 0xfe, 0xc4, 0xd4, 0x39, 0x8a,
+	0x29, 0x7a, 0xd7, 0xa6, 0x4e, 0xb3, 0x4d, 0x9d, 0xc3, 0x36, 0x75, 0x9e, 0xce, 0xee, 0xf0, 0x5e,
+	0xf9, 0x80, 0x8f, 0xf8, 0x40, 0x9e, 0x4f, 0x3f, 0x6f, 0xfd, 0xf7, 0xef, 0xeb, 0xf8, 0xfa, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x60, 0xf6, 0xb8, 0xb3, 0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -112,8 +112,8 @@ type AdminServiceClient interface {
 	AddSearchAttribute(ctx context.Context, in *AddSearchAttributeRequest, opts ...grpc.CallOption) (*AddSearchAttributeResponse, error)
 	// DescribeCluster returns information about Temporal cluster.
 	DescribeCluster(ctx context.Context, in *DescribeClusterRequest, opts ...grpc.CallOption) (*DescribeClusterResponse, error)
-	// ReadDLQMessages returns messages from DLQ.
-	ReadDLQMessages(ctx context.Context, in *ReadDLQMessagesRequest, opts ...grpc.CallOption) (*ReadDLQMessagesResponse, error)
+	// GetDLQMessages returns messages from DLQ.
+	GetDLQMessages(ctx context.Context, in *GetDLQMessagesRequest, opts ...grpc.CallOption) (*GetDLQMessagesResponse, error)
 	// PurgeDLQMessages purges messages from DLQ.
 	PurgeDLQMessages(ctx context.Context, in *PurgeDLQMessagesRequest, opts ...grpc.CallOption) (*PurgeDLQMessagesResponse, error)
 	// MergeDLQMessages merges messages from DLQ.
@@ -240,9 +240,9 @@ func (c *adminServiceClient) DescribeCluster(ctx context.Context, in *DescribeCl
 	return out, nil
 }
 
-func (c *adminServiceClient) ReadDLQMessages(ctx context.Context, in *ReadDLQMessagesRequest, opts ...grpc.CallOption) (*ReadDLQMessagesResponse, error) {
-	out := new(ReadDLQMessagesResponse)
-	err := c.cc.Invoke(ctx, "/temporal.server.api.adminservice.v1.AdminService/ReadDLQMessages", in, out, opts...)
+func (c *adminServiceClient) GetDLQMessages(ctx context.Context, in *GetDLQMessagesRequest, opts ...grpc.CallOption) (*GetDLQMessagesResponse, error) {
+	out := new(GetDLQMessagesResponse)
+	err := c.cc.Invoke(ctx, "/temporal.server.api.adminservice.v1.AdminService/GetDLQMessages", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -313,8 +313,8 @@ type AdminServiceServer interface {
 	AddSearchAttribute(context.Context, *AddSearchAttributeRequest) (*AddSearchAttributeResponse, error)
 	// DescribeCluster returns information about Temporal cluster.
 	DescribeCluster(context.Context, *DescribeClusterRequest) (*DescribeClusterResponse, error)
-	// ReadDLQMessages returns messages from DLQ.
-	ReadDLQMessages(context.Context, *ReadDLQMessagesRequest) (*ReadDLQMessagesResponse, error)
+	// GetDLQMessages returns messages from DLQ.
+	GetDLQMessages(context.Context, *GetDLQMessagesRequest) (*GetDLQMessagesResponse, error)
 	// PurgeDLQMessages purges messages from DLQ.
 	PurgeDLQMessages(context.Context, *PurgeDLQMessagesRequest) (*PurgeDLQMessagesResponse, error)
 	// MergeDLQMessages merges messages from DLQ.
@@ -365,8 +365,8 @@ func (*UnimplementedAdminServiceServer) AddSearchAttribute(ctx context.Context,
 func (*UnimplementedAdminServiceServer) DescribeCluster(ctx context.Context, req *DescribeClusterRequest) (*DescribeClusterResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DescribeCluster not implemented")
 }
-func (*UnimplementedAdminServiceServer) ReadDLQMessages(ctx context.Context, req *ReadDLQMessagesRequest) (*ReadDLQMessagesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReadDLQMessages not implemented")
+func (*UnimplementedAdminServiceServer) GetDLQMessages(ctx context.Context, req *GetDLQMessagesRequest) (*GetDLQMessagesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDLQMessages not implemented")
 }
 func (*UnimplementedAdminServiceServer) PurgeDLQMessages(ctx context.Context, req *PurgeDLQMessagesRequest) (*PurgeDLQMessagesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PurgeDLQMessages not implemented")
@@ -601,20 +601,20 @@ func _AdminService_DescribeCluster_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
-func _AdminService_ReadDLQMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReadDLQMessagesRequest)
+func _AdminService_GetDLQMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDLQMessagesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(AdminServiceServer).ReadDLQMessages(ctx, in)
+		return srv.(AdminServiceServer).GetDLQMessages(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/temporal.server.api.adminservice.v1.AdminService/ReadDLQMessages",
+		FullMethod: "/temporal.server.api.adminservice.v1.AdminService/GetDLQMessages",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AdminServiceServer).ReadDLQMessages(ctx, req.(*ReadDLQMessagesRequest))
+		return srv.(AdminServiceServer).GetDLQMessages(ctx, req.(*GetDLQMessagesRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -744,8 +744,8 @@ var _AdminService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _AdminService_DescribeCluster_Handler,
 		},
 		{
-			MethodName: "ReadDLQMessages",
-			Handler:    _AdminService_ReadDLQMessages_Handler,
+			MethodName: "GetDLQMessages",
+			Handler:    _AdminService_GetDLQMessages_Handler,
 		},
 		{
 			MethodName: "PurgeDLQMessages",
diff --git a/api/adminservicemock/v1/service.pb.mock.go b/api/adminservicemock/v1/service.pb.mock.go
index 6bd98cc076a..e5968f8753c 100644
--- a/api/adminservicemock/v1/service.pb.mock.go
+++ b/api/adminservicemock/v1/service.pb.mock.go
@@ -276,24 +276,24 @@ func (mr *MockAdminServiceClientMockRecorder) DescribeCluster(ctx, in interface{
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeCluster", reflect.TypeOf((*MockAdminServiceClient)(nil).DescribeCluster), varargs...)
 }
 
-// ReadDLQMessages mocks base method.
-func (m *MockAdminServiceClient) ReadDLQMessages(ctx context.Context, in *adminservice.ReadDLQMessagesRequest, opts ...grpc.CallOption) (*adminservice.ReadDLQMessagesResponse, error) {
+// GetDLQMessages mocks base method.
+func (m *MockAdminServiceClient) GetDLQMessages(ctx context.Context, in *adminservice.GetDLQMessagesRequest, opts ...grpc.CallOption) (*adminservice.GetDLQMessagesResponse, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{ctx, in}
 	for _, a := range opts {
 		varargs = append(varargs, a)
 	}
-	ret := m.ctrl.Call(m, "ReadDLQMessages", varargs...)
-	ret0, _ := ret[0].(*adminservice.ReadDLQMessagesResponse)
+	ret := m.ctrl.Call(m, "GetDLQMessages", varargs...)
+	ret0, _ := ret[0].(*adminservice.GetDLQMessagesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ReadDLQMessages indicates an expected call of ReadDLQMessages.
-func (mr *MockAdminServiceClientMockRecorder) ReadDLQMessages(ctx, in interface{}, opts ...interface{}) *gomock.Call {
+// GetDLQMessages indicates an expected call of GetDLQMessages.
+func (mr *MockAdminServiceClientMockRecorder) GetDLQMessages(ctx, in interface{}, opts ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{ctx, in}, opts...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadDLQMessages", reflect.TypeOf((*MockAdminServiceClient)(nil).ReadDLQMessages), varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDLQMessages", reflect.TypeOf((*MockAdminServiceClient)(nil).GetDLQMessages), varargs...)
 }
 
 // PurgeDLQMessages mocks base method.
@@ -579,19 +579,19 @@ func (mr *MockAdminServiceServerMockRecorder) DescribeCluster(arg0, arg1 interfa
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeCluster", reflect.TypeOf((*MockAdminServiceServer)(nil).DescribeCluster), arg0, arg1)
 }
 
-// ReadDLQMessages mocks base method.
-func (m *MockAdminServiceServer) ReadDLQMessages(arg0 context.Context, arg1 *adminservice.ReadDLQMessagesRequest) (*adminservice.ReadDLQMessagesResponse, error) {
+// GetDLQMessages mocks base method.
+func (m *MockAdminServiceServer) GetDLQMessages(arg0 context.Context, arg1 *adminservice.GetDLQMessagesRequest) (*adminservice.GetDLQMessagesResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ReadDLQMessages", arg0, arg1)
-	ret0, _ := ret[0].(*adminservice.ReadDLQMessagesResponse)
+	ret := m.ctrl.Call(m, "GetDLQMessages", arg0, arg1)
+	ret0, _ := ret[0].(*adminservice.GetDLQMessagesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ReadDLQMessages indicates an expected call of ReadDLQMessages.
-func (mr *MockAdminServiceServerMockRecorder) ReadDLQMessages(arg0, arg1 interface{}) *gomock.Call {
+// GetDLQMessages indicates an expected call of GetDLQMessages.
+func (mr *MockAdminServiceServerMockRecorder) GetDLQMessages(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadDLQMessages", reflect.TypeOf((*MockAdminServiceServer)(nil).ReadDLQMessages), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDLQMessages", reflect.TypeOf((*MockAdminServiceServer)(nil).GetDLQMessages), arg0, arg1)
 }
 
 // PurgeDLQMessages mocks base method.
diff --git a/api/historyservice/v1/request_response.pb.go b/api/historyservice/v1/request_response.pb.go
index 5e5432f83b8..62dd1226430 100644
--- a/api/historyservice/v1/request_response.pb.go
+++ b/api/historyservice/v1/request_response.pb.go
@@ -4079,7 +4079,7 @@ func (m *ReapplyEventsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ReapplyEventsResponse proto.InternalMessageInfo
 
-type ReadDLQMessagesRequest struct {
+type GetDLQMessagesRequest struct {
 	Type                  v17.DeadLetterQueueType `protobuf:"varint,1,opt,name=type,proto3,enum=temporal.server.api.enums.v1.DeadLetterQueueType" json:"type,omitempty"`
 	ShardId               int32                   `protobuf:"varint,2,opt,name=shard_id,json=shardId,proto3" json:"shard_id,omitempty"`
 	SourceCluster         string                  `protobuf:"bytes,3,opt,name=source_cluster,json=sourceCluster,proto3" json:"source_cluster,omitempty"`
@@ -4088,17 +4088,17 @@ type ReadDLQMessagesRequest struct {
 	NextPageToken         []byte                  `protobuf:"bytes,6,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 }
 
-func (m *ReadDLQMessagesRequest) Reset()      { *m = ReadDLQMessagesRequest{} }
-func (*ReadDLQMessagesRequest) ProtoMessage() {}
-func (*ReadDLQMessagesRequest) Descriptor() ([]byte, []int) {
+func (m *GetDLQMessagesRequest) Reset()      { *m = GetDLQMessagesRequest{} }
+func (*GetDLQMessagesRequest) ProtoMessage() {}
+func (*GetDLQMessagesRequest) Descriptor() ([]byte, []int) {
 	return fileDescriptor_b8c78c1d460a3711, []int{68}
 }
-func (m *ReadDLQMessagesRequest) XXX_Unmarshal(b []byte) error {
+func (m *GetDLQMessagesRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ReadDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *GetDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ReadDLQMessagesRequest.Marshal(b, m, deterministic)
+		return xxx_messageInfo_GetDLQMessagesRequest.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -4108,77 +4108,77 @@ func (m *ReadDLQMessagesRequest) XXX_Marshal(b []byte, deterministic bool) ([]by
 		return b[:n], nil
 	}
 }
-func (m *ReadDLQMessagesRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadDLQMessagesRequest.Merge(m, src)
+func (m *GetDLQMessagesRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDLQMessagesRequest.Merge(m, src)
 }
-func (m *ReadDLQMessagesRequest) XXX_Size() int {
+func (m *GetDLQMessagesRequest) XXX_Size() int {
 	return m.Size()
 }
-func (m *ReadDLQMessagesRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReadDLQMessagesRequest.DiscardUnknown(m)
+func (m *GetDLQMessagesRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDLQMessagesRequest.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ReadDLQMessagesRequest proto.InternalMessageInfo
+var xxx_messageInfo_GetDLQMessagesRequest proto.InternalMessageInfo
 
-func (m *ReadDLQMessagesRequest) GetType() v17.DeadLetterQueueType {
+func (m *GetDLQMessagesRequest) GetType() v17.DeadLetterQueueType {
 	if m != nil {
 		return m.Type
 	}
 	return v17.DEAD_LETTER_QUEUE_TYPE_UNSPECIFIED
 }
 
-func (m *ReadDLQMessagesRequest) GetShardId() int32 {
+func (m *GetDLQMessagesRequest) GetShardId() int32 {
 	if m != nil {
 		return m.ShardId
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetSourceCluster() string {
+func (m *GetDLQMessagesRequest) GetSourceCluster() string {
 	if m != nil {
 		return m.SourceCluster
 	}
 	return ""
 }
 
-func (m *ReadDLQMessagesRequest) GetInclusiveEndMessageId() int64 {
+func (m *GetDLQMessagesRequest) GetInclusiveEndMessageId() int64 {
 	if m != nil {
 		return m.InclusiveEndMessageId
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetMaximumPageSize() int32 {
+func (m *GetDLQMessagesRequest) GetMaximumPageSize() int32 {
 	if m != nil {
 		return m.MaximumPageSize
 	}
 	return 0
 }
 
-func (m *ReadDLQMessagesRequest) GetNextPageToken() []byte {
+func (m *GetDLQMessagesRequest) GetNextPageToken() []byte {
 	if m != nil {
 		return m.NextPageToken
 	}
 	return nil
 }
 
-type ReadDLQMessagesResponse struct {
+type GetDLQMessagesResponse struct {
 	Type             v17.DeadLetterQueueType `protobuf:"varint,1,opt,name=type,proto3,enum=temporal.server.api.enums.v1.DeadLetterQueueType" json:"type,omitempty"`
 	ReplicationTasks []*v16.ReplicationTask  `protobuf:"bytes,2,rep,name=replication_tasks,json=replicationTasks,proto3" json:"replication_tasks,omitempty"`
 	NextPageToken    []byte                  `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
 }
 
-func (m *ReadDLQMessagesResponse) Reset()      { *m = ReadDLQMessagesResponse{} }
-func (*ReadDLQMessagesResponse) ProtoMessage() {}
-func (*ReadDLQMessagesResponse) Descriptor() ([]byte, []int) {
+func (m *GetDLQMessagesResponse) Reset()      { *m = GetDLQMessagesResponse{} }
+func (*GetDLQMessagesResponse) ProtoMessage() {}
+func (*GetDLQMessagesResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_b8c78c1d460a3711, []int{69}
 }
-func (m *ReadDLQMessagesResponse) XXX_Unmarshal(b []byte) error {
+func (m *GetDLQMessagesResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *ReadDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *GetDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_ReadDLQMessagesResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_GetDLQMessagesResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -4188,33 +4188,33 @@ func (m *ReadDLQMessagesResponse) XXX_Marshal(b []byte, deterministic bool) ([]b
 		return b[:n], nil
 	}
 }
-func (m *ReadDLQMessagesResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadDLQMessagesResponse.Merge(m, src)
+func (m *GetDLQMessagesResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetDLQMessagesResponse.Merge(m, src)
 }
-func (m *ReadDLQMessagesResponse) XXX_Size() int {
+func (m *GetDLQMessagesResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *ReadDLQMessagesResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReadDLQMessagesResponse.DiscardUnknown(m)
+func (m *GetDLQMessagesResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetDLQMessagesResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_ReadDLQMessagesResponse proto.InternalMessageInfo
+var xxx_messageInfo_GetDLQMessagesResponse proto.InternalMessageInfo
 
-func (m *ReadDLQMessagesResponse) GetType() v17.DeadLetterQueueType {
+func (m *GetDLQMessagesResponse) GetType() v17.DeadLetterQueueType {
 	if m != nil {
 		return m.Type
 	}
 	return v17.DEAD_LETTER_QUEUE_TYPE_UNSPECIFIED
 }
 
-func (m *ReadDLQMessagesResponse) GetReplicationTasks() []*v16.ReplicationTask {
+func (m *GetDLQMessagesResponse) GetReplicationTasks() []*v16.ReplicationTask {
 	if m != nil {
 		return m.ReplicationTasks
 	}
 	return nil
 }
 
-func (m *ReadDLQMessagesResponse) GetNextPageToken() []byte {
+func (m *GetDLQMessagesResponse) GetNextPageToken() []byte {
 	if m != nil {
 		return m.NextPageToken
 	}
@@ -4610,8 +4610,8 @@ func init() {
 	proto.RegisterType((*QueryWorkflowResponse)(nil), "temporal.server.api.historyservice.v1.QueryWorkflowResponse")
 	proto.RegisterType((*ReapplyEventsRequest)(nil), "temporal.server.api.historyservice.v1.ReapplyEventsRequest")
 	proto.RegisterType((*ReapplyEventsResponse)(nil), "temporal.server.api.historyservice.v1.ReapplyEventsResponse")
-	proto.RegisterType((*ReadDLQMessagesRequest)(nil), "temporal.server.api.historyservice.v1.ReadDLQMessagesRequest")
-	proto.RegisterType((*ReadDLQMessagesResponse)(nil), "temporal.server.api.historyservice.v1.ReadDLQMessagesResponse")
+	proto.RegisterType((*GetDLQMessagesRequest)(nil), "temporal.server.api.historyservice.v1.GetDLQMessagesRequest")
+	proto.RegisterType((*GetDLQMessagesResponse)(nil), "temporal.server.api.historyservice.v1.GetDLQMessagesResponse")
 	proto.RegisterType((*PurgeDLQMessagesRequest)(nil), "temporal.server.api.historyservice.v1.PurgeDLQMessagesRequest")
 	proto.RegisterType((*PurgeDLQMessagesResponse)(nil), "temporal.server.api.historyservice.v1.PurgeDLQMessagesResponse")
 	proto.RegisterType((*MergeDLQMessagesRequest)(nil), "temporal.server.api.historyservice.v1.MergeDLQMessagesRequest")
@@ -4625,257 +4625,257 @@ func init() {
 }
 
 var fileDescriptor_b8c78c1d460a3711 = []byte{
-	// 3991 bytes of a gzipped FileDescriptorProto
+	// 3988 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3c, 0x49, 0x70, 0x1c, 0x59,
 	0x56, 0x4e, 0x95, 0xb6, 0x7a, 0x2a, 0x95, 0x54, 0xa9, 0xad, 0x24, 0xdb, 0x65, 0x29, 0x6d, 0xb5,
 	0xd5, 0xdd, 0xe3, 0x72, 0xdb, 0x9e, 0xe9, 0xc5, 0x33, 0x0c, 0x58, 0x5b, 0xbb, 0x22, 0x6c, 0xb7,
 	0x3a, 0xa5, 0x69, 0x13, 0x9e, 0x25, 0x27, 0x95, 0xf9, 0x4b, 0x95, 0x28, 0x2b, 0xb3, 0x3a, 0x7f,
 	0x96, 0xa4, 0x6a, 0x02, 0x18, 0x62, 0x02, 0x82, 0xe1, 0x40, 0x4c, 0x04, 0xc1, 0x09, 0x4e, 0x1c,
-	0x60, 0x4e, 0x70, 0xe0, 0x40, 0xcc, 0x81, 0xcb, 0x10, 0x41, 0x70, 0x6c, 0x38, 0x75, 0x04, 0x17,
-	0xda, 0x7d, 0x21, 0x98, 0x39, 0xcc, 0x81, 0x2b, 0x11, 0xc4, 0xdf, 0x72, 0xa9, 0xcc, 0xac, 0xc5,
-	0x72, 0x23, 0xa6, 0xe9, 0x9b, 0xea, 0xbf, 0xe5, 0xff, 0xf7, 0xfe, 0x5b, 0xfe, 0x7f, 0xff, 0xa5,
-	0xe0, 0x1b, 0x3e, 0x6a, 0xb6, 0x5c, 0x4f, 0xb7, 0x6f, 0x63, 0xe4, 0x9d, 0x20, 0xef, 0xb6, 0xde,
-	0xb2, 0x6e, 0x37, 0x2c, 0xec, 0xbb, 0x5e, 0x87, 0x8c, 0x58, 0x06, 0xba, 0x7d, 0x72, 0xe7, 0xb6,
-	0x87, 0x3e, 0x6c, 0x23, 0xec, 0x6b, 0x1e, 0xc2, 0x2d, 0xd7, 0xc1, 0xa8, 0xda, 0xf2, 0x5c, 0xdf,
-	0x95, 0xd7, 0x05, 0x75, 0x95, 0x51, 0x57, 0xf5, 0x96, 0x55, 0x8d, 0x53, 0x57, 0x4f, 0xee, 0xac,
-	0xdc, 0x08, 0x26, 0x21, 0xdc, 0x0d, 0xb7, 0xd9, 0x74, 0x1d, 0xc2, 0xb5, 0x89, 0x30, 0xd6, 0x8f,
-	0x38, 0xb3, 0x95, 0xf5, 0x18, 0x16, 0xe7, 0x92, 0x44, 0xbb, 0x19, 0x43, 0xf3, 0x75, 0x7c, 0xfc,
-	0x61, 0x1b, 0xb5, 0x51, 0x12, 0x31, 0x3e, 0x2b, 0x72, 0xda, 0x4d, 0x4c, 0x90, 0x4e, 0x5d, 0xef,
-	0xb8, 0x6e, 0xbb, 0xa7, 0x1c, 0xeb, 0x95, 0x18, 0x96, 0x00, 0x26, 0xb9, 0x5d, 0x8f, 0xe1, 0x7d,
-	0xd8, 0x46, 0x69, 0x6b, 0x8b, 0x8b, 0x50, 0xd7, 0x2d, 0xbb, 0xed, 0xa5, 0xac, 0xec, 0x2b, 0x3d,
-	0x94, 0x9e, 0xc4, 0x7e, 0x35, 0x0d, 0x3b, 0x10, 0x87, 0x69, 0x93, 0xa3, 0xbe, 0xde, 0x13, 0xb5,
-	0x4b, 0xf2, 0x9b, 0x3d, 0x91, 0x89, 0x62, 0x39, 0xe2, 0xad, 0x34, 0xc4, 0x6c, 0x4d, 0x55, 0xd3,
-	0xd0, 0x1d, 0xbd, 0x89, 0x70, 0x4b, 0x37, 0x52, 0xb4, 0xf1, 0x46, 0x1a, 0xbe, 0x87, 0x5a, 0xb6,
-	0x65, 0xe8, 0xbe, 0x95, 0x66, 0x29, 0x6f, 0xa6, 0xee, 0x59, 0x5f, 0x73, 0x5d, 0xb9, 0x9f, 0x36,
-	0x93, 0x6e, 0x36, 0x2d, 0xa7, 0x2f, 0xad, 0xf2, 0xe9, 0x18, 0x5c, 0xdd, 0xf7, 0x75, 0xcf, 0x7f,
-	0xca, 0xa7, 0xdb, 0x39, 0x43, 0x46, 0x9b, 0xac, 0x4f, 0x65, 0x04, 0xf2, 0x1a, 0x14, 0x02, 0x29,
-	0x35, 0xcb, 0x2c, 0x4b, 0xab, 0xd2, 0x46, 0x5e, 0x9d, 0x0a, 0xc6, 0x6a, 0xa6, 0x6c, 0xc0, 0x34,
-	0x26, 0x3c, 0x34, 0x3e, 0x49, 0x79, 0x64, 0x55, 0xda, 0x98, 0xba, 0xfb, 0xcd, 0x40, 0x65, 0xd4,
-	0x81, 0xba, 0x04, 0xaa, 0x9e, 0xdc, 0xa9, 0xf6, 0x9c, 0x59, 0x2d, 0x50, 0xa6, 0x62, 0x1d, 0x0d,
-	0x58, 0x68, 0xe9, 0x1e, 0x72, 0x7c, 0x0d, 0x09, 0x44, 0xcd, 0x72, 0xea, 0x6e, 0x39, 0x47, 0x27,
-	0xfb, 0x6a, 0x35, 0xcd, 0x69, 0x03, 0xdb, 0x38, 0xb9, 0x53, 0xdd, 0xa3, 0xd4, 0xc1, 0x2c, 0x35,
-	0xa7, 0xee, 0xaa, 0x73, 0xad, 0xe4, 0xa0, 0x5c, 0x86, 0x09, 0xdd, 0x27, 0xdc, 0xfc, 0xf2, 0xe8,
-	0xaa, 0xb4, 0x31, 0xa6, 0x8a, 0x9f, 0xf2, 0xb7, 0xe0, 0xa6, 0xe0, 0x18, 0x59, 0x05, 0x3a, 0x6b,
-	0x59, 0x1e, 0xdd, 0x53, 0xcd, 0xb7, 0x9a, 0x08, 0xfb, 0x7a, 0xb3, 0x55, 0x1e, 0x5b, 0x95, 0x36,
-	0x72, 0xea, 0x8d, 0xd3, 0x6e, 0xe1, 0x76, 0x02, 0xe4, 0x03, 0x81, 0x2b, 0x37, 0x60, 0xd9, 0x70,
-	0x1d, 0xdf, 0x72, 0xda, 0x48, 0xd3, 0xb1, 0xe6, 0xa0, 0x53, 0xcd, 0x72, 0x2c, 0xdf, 0xd2, 0x7d,
-	0xd7, 0x2b, 0x8f, 0xaf, 0x4a, 0x1b, 0xc5, 0xbb, 0xb7, 0xe2, 0xba, 0xa4, 0xf6, 0x4c, 0x84, 0xda,
-	0xe2, 0x74, 0x0f, 0xf0, 0x13, 0x74, 0x5a, 0x13, 0x44, 0xea, 0xa2, 0x91, 0x3a, 0x2e, 0x3f, 0x86,
-	0x92, 0x80, 0x98, 0x1a, 0x77, 0xe4, 0xf2, 0x04, 0x55, 0xe0, 0x6a, 0x7c, 0x06, 0x0e, 0x24, 0x73,
-	0xec, 0xb2, 0x3f, 0xd5, 0xd9, 0x80, 0x94, 0x8f, 0xc8, 0x1f, 0xc0, 0xa2, 0xad, 0x63, 0x5f, 0x33,
-	0xdc, 0x66, 0xcb, 0x46, 0x54, 0x03, 0x1e, 0xc2, 0x6d, 0xdb, 0x2f, 0x4f, 0xa6, 0xf1, 0xe4, 0x4e,
-	0x4d, 0xf7, 0xa2, 0x63, 0xbb, 0xba, 0x89, 0xd5, 0x79, 0x42, 0xbf, 0x15, 0x90, 0xab, 0x94, 0x5a,
-	0x7e, 0x04, 0xd7, 0xeb, 0x96, 0x87, 0x7d, 0xcd, 0x44, 0x86, 0x85, 0xa9, 0x62, 0x75, 0x7c, 0xac,
-	0x1d, 0xea, 0xc6, 0xb1, 0x5b, 0xaf, 0x6b, 0x18, 0x19, 0xae, 0x63, 0xe2, 0x72, 0x9e, 0xee, 0xce,
-	0x35, 0x8a, 0xba, 0xcd, 0x31, 0x0f, 0x74, 0x7c, 0xbc, 0xc9, 0xf0, 0xf6, 0x19, 0x9a, 0xf2, 0x16,
-	0x54, 0xb2, 0x0c, 0x8d, 0xf9, 0x82, 0xbc, 0x00, 0xe3, 0x5e, 0xdb, 0x09, 0xad, 0x7b, 0xcc, 0x6b,
-	0x3b, 0x35, 0x53, 0xf9, 0xb9, 0x04, 0x8b, 0xef, 0x22, 0xff, 0x71, 0xdb, 0xd7, 0x0f, 0x6d, 0xb4,
-	0xef, 0xeb, 0x3e, 0x1a, 0xc2, 0x2b, 0xde, 0x85, 0x7c, 0x60, 0x23, 0xdc, 0x23, 0x5e, 0xcd, 0xd2,
-	0x47, 0x72, 0x69, 0x21, 0xad, 0x7c, 0x0f, 0x16, 0xd1, 0x59, 0x0b, 0x19, 0x3e, 0x32, 0x35, 0x07,
-	0x9d, 0xf9, 0x1a, 0x3a, 0x21, 0x6e, 0x60, 0x99, 0xd4, 0xf4, 0x73, 0xea, 0x9c, 0x80, 0x3e, 0x41,
-	0x67, 0xfe, 0x0e, 0x81, 0xd5, 0x4c, 0xf9, 0x0d, 0x98, 0x37, 0xda, 0x1e, 0xf5, 0x97, 0x43, 0x4f,
-	0x77, 0x8c, 0x86, 0xe6, 0xbb, 0xc7, 0xc8, 0xa1, 0x16, 0x5d, 0x50, 0x65, 0x0e, 0xdb, 0xa4, 0xa0,
-	0x03, 0x02, 0x51, 0x7e, 0x0e, 0xb0, 0x94, 0x90, 0x96, 0x2b, 0x28, 0x26, 0x8b, 0x74, 0x0e, 0x59,
-	0x6a, 0x30, 0x1d, 0x78, 0x90, 0xdf, 0x69, 0x21, 0xae, 0x98, 0x1b, 0xfd, 0x98, 0x1d, 0x74, 0x5a,
-	0x48, 0x2d, 0x9c, 0x46, 0x7e, 0xc9, 0x0a, 0x4c, 0xa7, 0x69, 0x63, 0xca, 0x89, 0x68, 0xe1, 0x1d,
-	0x58, 0x6e, 0x79, 0xe8, 0xc4, 0x72, 0xdb, 0x58, 0xa3, 0xd1, 0x04, 0x99, 0x21, 0xfe, 0x28, 0xc5,
-	0x5f, 0x14, 0x08, 0xfb, 0x0c, 0x2e, 0x48, 0x6f, 0xc1, 0x1c, 0xb5, 0x6d, 0x66, 0x88, 0x01, 0x11,
-	0xf3, 0xeb, 0x59, 0x02, 0xda, 0x25, 0x10, 0x81, 0xbe, 0x05, 0x40, 0x6d, 0x94, 0x66, 0x6d, 0xea,
-	0xb4, 0x09, 0xa9, 0x82, 0xa4, 0x4e, 0x04, 0x23, 0x76, 0xfa, 0x3e, 0xf9, 0xa1, 0xe6, 0x7d, 0xf1,
-	0xa7, 0xbc, 0x07, 0x25, 0xec, 0x5b, 0xc6, 0x71, 0x47, 0x8b, 0xf0, 0x9a, 0x18, 0x82, 0xd7, 0x0c,
-	0x23, 0x0f, 0x06, 0xe4, 0xaf, 0xc2, 0xa2, 0x61, 0x5b, 0x64, 0xed, 0xb6, 0x75, 0xe8, 0xe9, 0x5e,
-	0x47, 0x3b, 0x41, 0x1e, 0xf1, 0x13, 0xea, 0xa1, 0x79, 0x75, 0x9e, 0x41, 0x1f, 0x31, 0xe0, 0x07,
-	0x0c, 0x16, 0xa1, 0xaa, 0x23, 0xdd, 0x6f, 0x7b, 0x28, 0xa0, 0xca, 0x47, 0xa9, 0x76, 0x19, 0x50,
-	0x50, 0x5d, 0x83, 0x29, 0x4e, 0x65, 0x35, 0x5b, 0x76, 0x19, 0x28, 0x2a, 0xb0, 0xa1, 0x5a, 0xb3,
-	0x65, 0xcb, 0xcf, 0xe0, 0xf5, 0x84, 0x78, 0x1a, 0x36, 0x1a, 0xc8, 0x6c, 0xdb, 0x48, 0xf3, 0x5d,
-	0xb6, 0x45, 0x34, 0x88, 0xba, 0x6d, 0xbf, 0x3c, 0x45, 0xdd, 0x7b, 0xbd, 0x4b, 0xa4, 0x7d, 0x8e,
-	0x7f, 0xe0, 0xd2, 0x0d, 0x3b, 0x60, 0xc8, 0x72, 0x15, 0xe6, 0xd8, 0x1e, 0x91, 0xe3, 0x46, 0xb8,
-	0xde, 0x02, 0xe5, 0x51, 0xa2, 0xa0, 0x7d, 0x02, 0x11, 0x8b, 0xcd, 0xf2, 0x8f, 0xe9, 0x2c, 0xff,
-	0x90, 0x7f, 0x17, 0x66, 0x23, 0xe9, 0x9b, 0xe5, 0x9e, 0xe2, 0x6a, 0x6e, 0x63, 0xea, 0xee, 0x7e,
-	0x75, 0xa0, 0x03, 0x63, 0x35, 0xc3, 0xbb, 0xaa, 0x6a, 0xc8, 0x96, 0x24, 0xa0, 0x1d, 0xc7, 0xf7,
-	0x3a, 0xea, 0x8c, 0x17, 0x1f, 0x95, 0xbf, 0x0d, 0xc5, 0xc0, 0x75, 0x30, 0xa1, 0x2f, 0xcf, 0xd0,
-	0xd4, 0x90, 0x9e, 0xf9, 0x82, 0x0c, 0x91, 0x70, 0x47, 0x36, 0x77, 0xe0, 0x86, 0xf4, 0xa7, 0xfc,
-	0x14, 0x66, 0x62, 0xcc, 0xdb, 0xb8, 0x3c, 0x4b, 0xb9, 0x57, 0x33, 0x12, 0x4f, 0x2a, 0xdb, 0x36,
-	0x56, 0x8b, 0x51, 0xbe, 0x6d, 0x2c, 0x7f, 0x17, 0x4a, 0x7c, 0x2f, 0x34, 0xa6, 0x10, 0x0b, 0xe1,
-	0x72, 0x89, 0x9a, 0xf4, 0x1b, 0xbd, 0xd4, 0x46, 0xe6, 0xe0, 0x7b, 0xf5, 0x50, 0xd0, 0xa9, 0xb3,
-	0x27, 0x5d, 0x23, 0xf2, 0x37, 0xe1, 0x8a, 0x45, 0x5c, 0xbb, 0xdb, 0xaa, 0x90, 0x43, 0xd4, 0x6c,
-	0x96, 0xe5, 0x55, 0x69, 0x63, 0x52, 0x2d, 0x5b, 0x78, 0x3f, 0x6e, 0x45, 0x3b, 0x0c, 0xbe, 0x72,
-	0x0a, 0xf3, 0x69, 0xda, 0x97, 0x67, 0x21, 0x77, 0x8c, 0x3a, 0x3c, 0xac, 0x93, 0x3f, 0xe5, 0x1a,
-	0x8c, 0x9d, 0xe8, 0x76, 0x5b, 0x44, 0xac, 0x7b, 0xa9, 0x8b, 0x8f, 0xec, 0x19, 0x11, 0xa0, 0x8b,
-	0xb5, 0xca, 0x38, 0xdc, 0x1f, 0x79, 0x5b, 0x52, 0x7e, 0x21, 0xc1, 0xd2, 0x9e, 0x6b, 0xdb, 0xff,
-	0x4f, 0x92, 0xcb, 0x7f, 0xe7, 0xa1, 0x9c, 0x14, 0xf7, 0xcb, 0xec, 0xf2, 0x65, 0x76, 0xf9, 0x95,
-	0xc8, 0x2e, 0x59, 0x06, 0x5f, 0xc8, 0xcc, 0x16, 0xbf, 0x97, 0x92, 0x2d, 0xa6, 0x69, 0xb6, 0x38,
-	0x18, 0x30, 0x5b, 0x64, 0xb9, 0xcb, 0x80, 0xe9, 0x22, 0x35, 0xf0, 0x16, 0x5f, 0x5a, 0xe0, 0xfd,
-	0x95, 0xcc, 0x46, 0x17, 0x17, 0xee, 0x7f, 0x24, 0xc1, 0x65, 0x15, 0x61, 0xe4, 0x77, 0xe5, 0xa1,
-	0x0b, 0x08, 0xf9, 0x4a, 0x05, 0xae, 0xa4, 0x2f, 0x85, 0xd9, 0x97, 0xf2, 0xc9, 0x08, 0xac, 0xaa,
-	0xc8, 0x70, 0x3d, 0x33, 0x7a, 0xa9, 0xe2, 0x01, 0x6c, 0x88, 0x05, 0xff, 0x26, 0xc8, 0xc9, 0xdb,
-	0xf2, 0xf0, 0x2b, 0x2f, 0x25, 0xee, 0xd0, 0x24, 0x16, 0x04, 0x8e, 0x1d, 0x84, 0x66, 0x10, 0x43,
-	0x35, 0x53, 0x5e, 0x82, 0x09, 0x1a, 0x04, 0x82, 0x38, 0x3c, 0x4e, 0x7e, 0xd6, 0x4c, 0xf9, 0x2a,
-	0x80, 0xa8, 0x84, 0xf0, 0x70, 0x9b, 0x57, 0xf3, 0x7c, 0xa4, 0x66, 0xca, 0xdf, 0x83, 0x42, 0xcb,
-	0xb5, 0xed, 0xa0, 0x90, 0xc1, 0x22, 0xed, 0xd7, 0xfb, 0x16, 0x32, 0x88, 0xaf, 0xee, 0xba, 0x5e,
-	0x54, 0x5f, 0xa2, 0x8a, 0x31, 0x45, 0x18, 0xf2, 0x1f, 0xca, 0xcf, 0x26, 0x60, 0xad, 0x87, 0x6a,
-	0x79, 0x3e, 0x4c, 0xa4, 0x31, 0xe9, 0x85, 0xd3, 0x58, 0xcf, 0x14, 0x35, 0xd2, 0x33, 0x45, 0x7d,
-	0x05, 0x64, 0xa1, 0x51, 0xb3, 0x3b, 0x0d, 0xce, 0x06, 0x10, 0x81, 0xbd, 0x01, 0xb3, 0x19, 0x29,
-	0xb0, 0x88, 0xe3, 0x7c, 0x13, 0x99, 0x75, 0x2c, 0x99, 0x59, 0x23, 0x25, 0x98, 0x71, 0x0a, 0x0d,
-	0x4a, 0x30, 0x6f, 0x43, 0x99, 0x47, 0xf9, 0x48, 0x01, 0x86, 0x1f, 0xf6, 0x26, 0xe8, 0x61, 0x6f,
-	0x91, 0xc1, 0xc3, 0x8a, 0x0b, 0x83, 0xca, 0xcf, 0x60, 0x3a, 0x28, 0x27, 0xd0, 0x70, 0xcc, 0x6a,
-	0x14, 0x5f, 0xeb, 0x17, 0x0c, 0x0f, 0x3c, 0xdd, 0xc1, 0x24, 0xcb, 0x88, 0x2d, 0xa3, 0xbe, 0x5d,
-	0x30, 0x23, 0xbf, 0xe4, 0x23, 0xb8, 0x9a, 0x52, 0x18, 0x8a, 0xa4, 0xd9, 0xfc, 0x10, 0x69, 0x76,
-	0x25, 0x61, 0xf0, 0x61, 0xc6, 0xcd, 0xb8, 0xe6, 0x40, 0xd6, 0x35, 0x67, 0x0d, 0x0a, 0xb1, 0x84,
-	0x35, 0x45, 0x13, 0xd6, 0xd4, 0x61, 0x24, 0x53, 0xdd, 0x86, 0xb9, 0x70, 0x9f, 0xc3, 0x02, 0x56,
-	0x81, 0xea, 0x3d, 0x34, 0x81, 0xb0, 0x5c, 0xf5, 0x3a, 0x39, 0x47, 0xb0, 0xad, 0x0e, 0xd1, 0xa7,
-	0xb9, 0x5d, 0x30, 0x40, 0x88, 0xec, 0xc2, 0xc4, 0x87, 0x6d, 0xc4, 0x93, 0x0f, 0x49, 0x7f, 0xdf,
-	0x1a, 0x30, 0xfd, 0xf5, 0x75, 0x93, 0xea, 0xfb, 0x8c, 0x2f, 0xcb, 0x7f, 0x62, 0x96, 0x95, 0xef,
-	0x43, 0x21, 0x0a, 0x48, 0x09, 0xed, 0xf7, 0xe3, 0xa1, 0xbd, 0x6b, 0x53, 0x68, 0x0d, 0x3c, 0xea,
-	0x55, 0x84, 0x5b, 0x27, 0x1a, 0xcb, 0xc3, 0xf8, 0xf8, 0xc0, 0xf0, 0xad, 0x13, 0xcb, 0xef, 0x7c,
-	0x19, 0x1f, 0x07, 0x8b, 0x8f, 0x51, 0x7d, 0xa5, 0xc6, 0xc7, 0x7f, 0xc9, 0x89, 0xf8, 0x98, 0xaa,
-	0x5a, 0x1e, 0x1f, 0x9f, 0xc0, 0x4c, 0x57, 0x64, 0xe2, 0x11, 0x72, 0x3d, 0xbe, 0x90, 0x88, 0x13,
-	0xb3, 0x83, 0x4b, 0x87, 0xc6, 0x17, 0xb5, 0x18, 0x8f, 0x5e, 0xe9, 0x06, 0x3d, 0x92, 0x61, 0xd0,
-	0x91, 0xd0, 0x94, 0x8b, 0x87, 0xa6, 0x47, 0x70, 0x3d, 0xc5, 0x91, 0x34, 0xb7, 0xae, 0xf9, 0x0d,
-	0x0b, 0x6b, 0xd1, 0x9a, 0x72, 0x4e, 0xbd, 0x96, 0x74, 0xac, 0xf7, 0xea, 0x07, 0x0d, 0x0b, 0x3f,
-	0xe0, 0xdc, 0x1e, 0x43, 0xa9, 0x81, 0x74, 0xcf, 0x3f, 0x44, 0xba, 0xaf, 0x99, 0xc8, 0xd7, 0x2d,
-	0x1b, 0xd3, 0x0d, 0x19, 0xa4, 0xac, 0x3a, 0x1b, 0x90, 0x6e, 0x33, 0xca, 0x64, 0x4e, 0x19, 0x7f,
-	0xe1, 0x9c, 0x72, 0x2b, 0x62, 0xb7, 0x81, 0x3d, 0xd3, 0xe0, 0x9b, 0x0f, 0x8d, 0xf1, 0x89, 0x00,
-	0x28, 0x3f, 0x95, 0xe0, 0x3a, 0xdb, 0xba, 0x98, 0x37, 0xf3, 0xa2, 0xef, 0x50, 0x1e, 0xe3, 0xc2,
-	0x2c, 0x2f, 0x35, 0xa3, 0xae, 0xb7, 0x86, 0xed, 0xbe, 0x26, 0x38, 0xc0, 0x12, 0xd4, 0x19, 0xc1,
-	0x5d, 0xd8, 0xe3, 0x9f, 0x4b, 0x70, 0xa3, 0x37, 0x21, 0x37, 0x49, 0x1c, 0xa6, 0x3f, 0xf1, 0xc2,
-	0xc2, 0x6d, 0xf2, 0xe1, 0xcb, 0x8a, 0x77, 0xe4, 0xfa, 0x15, 0x1b, 0x50, 0xfe, 0x56, 0x22, 0x81,
-	0x28, 0xb1, 0xba, 0x5d, 0xdd, 0xb2, 0x87, 0x52, 0x6b, 0x03, 0x8a, 0x75, 0x4a, 0xd3, 0xa5, 0xd4,
-	0x07, 0x2f, 0xa2, 0xd4, 0xd8, 0xec, 0xea, 0x74, 0x3d, 0xfa, 0x53, 0xb9, 0x4e, 0xdc, 0x3b, 0x93,
-	0x84, 0x8b, 0xf5, 0x53, 0x09, 0x94, 0x64, 0x10, 0x78, 0x28, 0x2c, 0x7a, 0x08, 0xc1, 0x5a, 0x51,
-	0x1f, 0x8a, 0xcb, 0xb6, 0x35, 0x80, 0x6c, 0xfd, 0x96, 0x10, 0x71, 0x33, 0x21, 0xe0, 0x1e, 0xb1,
-	0xf5, 0x1e, 0x74, 0xdc, 0x5c, 0x5e, 0x85, 0x59, 0x43, 0x77, 0x0c, 0x14, 0x44, 0x52, 0xc4, 0xd6,
-	0x3f, 0xa9, 0xce, 0xb0, 0x71, 0x55, 0x0c, 0x47, 0xdd, 0x27, 0xca, 0xf3, 0x82, 0xdc, 0xa7, 0xd7,
-	0x12, 0x92, 0xee, 0xf3, 0x4a, 0xe0, 0x3d, 0x19, 0x74, 0x49, 0x43, 0x8e, 0x22, 0xfe, 0xef, 0x1b,
-	0x72, 0xe6, 0xec, 0xd9, 0x86, 0x9c, 0x46, 0xc2, 0xc5, 0xfa, 0x3b, 0x6a, 0xc8, 0x49, 0xf9, 0xe9,
-	0x0e, 0x0f, 0x25, 0xd8, 0x6f, 0x41, 0x31, 0x6e, 0x2f, 0x43, 0x58, 0x71, 0xbf, 0xf9, 0xd5, 0xe9,
-	0x98, 0xc9, 0x29, 0xeb, 0xe9, 0xf6, 0x16, 0x10, 0x71, 0xe1, 0xfe, 0x69, 0x04, 0x2a, 0xfb, 0xd6,
-	0x91, 0xa3, 0xdb, 0xe7, 0x79, 0x3a, 0xae, 0x43, 0x11, 0x53, 0x26, 0x5d, 0x82, 0xfd, 0x7a, 0xff,
-	0xb7, 0xe3, 0x9e, 0x73, 0xab, 0xd3, 0x8c, 0xad, 0x58, 0x8a, 0x05, 0x97, 0xd1, 0x99, 0x8f, 0x3c,
-	0x32, 0x53, 0xca, 0xa1, 0x2b, 0x37, 0xec, 0xa1, 0x6b, 0x59, 0x70, 0x4b, 0x80, 0xc8, 0x11, 0xdd,
-	0x68, 0x58, 0xb6, 0x19, 0xce, 0xe3, 0x3a, 0x76, 0x87, 0xa6, 0xfd, 0x49, 0xb5, 0x44, 0x41, 0x82,
-	0xe8, 0x3d, 0xc7, 0xee, 0x28, 0x6b, 0x70, 0x2d, 0x53, 0x16, 0xae, 0xeb, 0x7f, 0x95, 0xe0, 0x26,
-	0xc7, 0xb1, 0xfc, 0xc6, 0xb9, 0xdf, 0xeb, 0x7f, 0x28, 0xc1, 0x32, 0xd7, 0xfa, 0xa9, 0xe5, 0x37,
-	0xb4, 0xb4, 0xc7, 0xfb, 0x87, 0x83, 0x6e, 0x40, 0xbf, 0x05, 0xa9, 0x8b, 0x38, 0x8e, 0x28, 0xec,
-	0xec, 0x01, 0x6c, 0xf4, 0x67, 0xd1, 0xfb, 0x81, 0xf6, 0x1f, 0x24, 0xb8, 0xa6, 0xa2, 0xa6, 0x7b,
-	0x82, 0x18, 0xa7, 0x17, 0x2c, 0xa6, 0x7f, 0x7e, 0x07, 0xf1, 0xf8, 0x71, 0x3a, 0xd7, 0x75, 0x9c,
-	0x56, 0x14, 0x12, 0xf6, 0xb2, 0x96, 0xcf, 0xf7, 0xfe, 0xef, 0x25, 0x58, 0x3b, 0x40, 0x5e, 0xd3,
-	0x72, 0x74, 0x1f, 0x9d, 0x67, 0xd7, 0x5d, 0x28, 0xf9, 0x82, 0x4f, 0xd7, 0x66, 0x6f, 0xf6, 0xdd,
-	0xec, 0xbe, 0x2b, 0x50, 0x67, 0x03, 0xe6, 0x62, 0x83, 0x6f, 0x80, 0xd2, 0x8b, 0x8c, 0xcb, 0xf7,
-	0xd7, 0x12, 0x5c, 0xa5, 0xe5, 0xa8, 0x73, 0x76, 0xa0, 0x78, 0x84, 0xc7, 0xd0, 0x1d, 0x28, 0x3d,
-	0x67, 0x56, 0x0b, 0x94, 0xa9, 0x90, 0xe7, 0x2d, 0xa8, 0x64, 0xa1, 0xf7, 0x36, 0xd3, 0x3f, 0xcd,
-	0xc1, 0x3a, 0x67, 0xc2, 0xc2, 0xe8, 0x79, 0x44, 0x6d, 0x66, 0xa4, 0x82, 0xdd, 0x01, 0x64, 0x1d,
-	0x60, 0x09, 0x5d, 0xd9, 0x40, 0xfe, 0xb5, 0x48, 0xe0, 0xe4, 0x4d, 0x29, 0xc9, 0x72, 0x50, 0x59,
-	0xa0, 0xd4, 0x04, 0x86, 0x28, 0xe4, 0xf4, 0x89, 0xbb, 0xa3, 0x9f, 0x7f, 0xdc, 0x1d, 0xcb, 0x8a,
-	0xbb, 0x1b, 0xf0, 0x4a, 0x3f, 0x8d, 0x88, 0x54, 0x27, 0xc1, 0x65, 0xf1, 0x30, 0x90, 0x52, 0xe2,
-	0xbb, 0xd8, 0x10, 0xf3, 0x1a, 0x94, 0x2c, 0xac, 0xc5, 0xdb, 0x65, 0xe8, 0xb6, 0x4c, 0xaa, 0x33,
-	0x16, 0xde, 0x8d, 0xf6, 0xc6, 0x28, 0x15, 0xb8, 0x92, 0x2e, 0x07, 0x17, 0xf4, 0xbf, 0x46, 0xc8,
-	0x81, 0x8d, 0x1c, 0x5f, 0xb7, 0x88, 0xba, 0x82, 0x49, 0x5e, 0xe4, 0xb0, 0xf9, 0xf9, 0x49, 0xbc,
-	0x06, 0x85, 0xd0, 0x12, 0xc3, 0x97, 0xb9, 0x60, 0xac, 0x66, 0xca, 0xcf, 0x60, 0x4e, 0x9c, 0x45,
-	0xcd, 0xf3, 0x98, 0x9b, 0x1c, 0x70, 0x09, 0xa7, 0xdf, 0x0b, 0x4e, 0xd1, 0xb4, 0xf6, 0x48, 0xcb,
-	0x0f, 0x63, 0xc3, 0x94, 0x1f, 0x66, 0x42, 0x72, 0x3a, 0xa0, 0xdc, 0x24, 0xe1, 0xa1, 0xa7, 0xd6,
-	0xf9, 0xfe, 0xfc, 0xa5, 0x04, 0xab, 0xdb, 0x08, 0x1b, 0x9e, 0x75, 0x78, 0xae, 0x54, 0xf0, 0x6d,
-	0x98, 0x18, 0xf6, 0x80, 0xdc, 0x6f, 0x5a, 0x55, 0x70, 0x54, 0x7e, 0x92, 0x83, 0xb5, 0x1e, 0xd8,
-	0x3c, 0x54, 0x7e, 0x07, 0x66, 0xc3, 0x42, 0xa9, 0xe1, 0x3a, 0x75, 0xeb, 0x88, 0x5f, 0x98, 0xef,
-	0xa4, 0xaf, 0x25, 0x75, 0x83, 0xb6, 0x28, 0xa1, 0x3a, 0x83, 0xe2, 0x03, 0xf2, 0x11, 0x2c, 0xa5,
-	0xd4, 0x63, 0x69, 0xd5, 0x97, 0x09, 0x7c, 0x7b, 0x88, 0x49, 0x68, 0xbd, 0x77, 0xe1, 0x34, 0x6d,
-	0x58, 0xfe, 0x0e, 0xc8, 0x2d, 0xe4, 0x98, 0x96, 0x73, 0xa4, 0xe9, 0xec, 0xb4, 0x6c, 0x21, 0x5c,
-	0xce, 0xd1, 0x4a, 0xe7, 0xad, 0xec, 0x39, 0xf6, 0x18, 0x8d, 0x38, 0x60, 0xd3, 0x19, 0x4a, 0xad,
-	0xd8, 0xa0, 0x85, 0xb0, 0xfc, 0x3d, 0x98, 0x15, 0xdc, 0x69, 0xfc, 0xf2, 0xe8, 0x1b, 0x7b, 0x2e,
-	0xfe, 0x1e, 0x95, 0xc1, 0x3b, 0x6e, 0x4b, 0x74, 0x86, 0x99, 0x56, 0x04, 0xe4, 0x21, 0x47, 0xf9,
-	0xe1, 0x04, 0x2c, 0x8a, 0x47, 0x2b, 0x44, 0x6d, 0x11, 0x0b, 0x2b, 0x5a, 0x87, 0x22, 0x76, 0xdb,
-	0x9e, 0x81, 0x34, 0xc3, 0x6e, 0x63, 0x1f, 0x79, 0xdc, 0x8e, 0xa6, 0xd9, 0xe8, 0x16, 0x1b, 0x4c,
-	0x18, 0xdb, 0xc8, 0xa0, 0x81, 0x20, 0xf7, 0x12, 0x02, 0xc1, 0x0d, 0x28, 0x76, 0xbd, 0x9f, 0xb3,
-	0xda, 0x5a, 0xa1, 0x1e, 0x7d, 0x3b, 0x1f, 0xf0, 0xbd, 0x41, 0x94, 0xd2, 0xf9, 0x7b, 0x03, 0xff,
-	0x29, 0xff, 0x4e, 0xca, 0x3b, 0xee, 0x04, 0xdd, 0x02, 0x75, 0xe0, 0xc2, 0x4e, 0x9a, 0x82, 0x07,
-	0x7c, 0xc5, 0xbd, 0x0f, 0x13, 0x9c, 0x63, 0x7a, 0x4b, 0x65, 0x32, 0xc6, 0xa8, 0x82, 0x40, 0x7e,
-	0x08, 0x33, 0x0e, 0x3a, 0xd5, 0xc8, 0x89, 0x44, 0xf0, 0xc8, 0x0f, 0xc8, 0x63, 0xda, 0x41, 0xa7,
-	0x6a, 0x9b, 0x3f, 0xf7, 0x76, 0x48, 0x6a, 0xad, 0xbb, 0xc4, 0x16, 0x0e, 0xdb, 0xf5, 0x3a, 0xf2,
-	0x98, 0x2a, 0x31, 0x7d, 0x75, 0x98, 0x54, 0x4b, 0x14, 0xb4, 0x49, 0x21, 0x4c, 0xc4, 0xac, 0x57,
-	0x8a, 0xa9, 0xac, 0x57, 0x8a, 0x6f, 0xc0, 0x65, 0xb1, 0xd2, 0xec, 0x26, 0xae, 0x25, 0xb6, 0xa6,
-	0x9d, 0x04, 0xf5, 0x3a, 0x14, 0xd9, 0xe1, 0x4f, 0x58, 0x08, 0x7d, 0x8c, 0x98, 0x54, 0xd9, 0x91,
-	0x50, 0x58, 0x92, 0x5c, 0x81, 0x29, 0x31, 0x89, 0x63, 0x1a, 0xf4, 0x29, 0x7c, 0x52, 0xcd, 0x33,
-	0xa6, 0x4f, 0x4c, 0xe3, 0xe2, 0xde, 0x86, 0x97, 0x61, 0x29, 0x61, 0x23, 0x3c, 0xe0, 0xff, 0xd1,
-	0x18, 0x2c, 0x07, 0x30, 0x55, 0x3f, 0x8d, 0xfb, 0xe8, 0x85, 0x66, 0xe1, 0x1f, 0x48, 0x29, 0x9e,
-	0x91, 0x1b, 0xf2, 0x89, 0x27, 0x43, 0xb2, 0xe1, 0x9d, 0x63, 0xb4, 0x77, 0x61, 0x7c, 0x5b, 0xf7,
-	0xf5, 0x4d, 0xdb, 0x3d, 0xec, 0xe9, 0x1c, 0x63, 0x03, 0xf2, 0x48, 0x3a, 0x47, 0x9a, 0xd1, 0x8e,
-	0xbf, 0xa0, 0xb1, 0x4f, 0xf4, 0x34, 0xf6, 0x8b, 0xb3, 0xd2, 0x2b, 0xb0, 0x92, 0xb6, 0x5f, 0xdc,
-	0x50, 0x7f, 0x3f, 0x07, 0xe5, 0x2e, 0x23, 0xfe, 0xe0, 0xee, 0xff, 0x09, 0x3b, 0xad, 0xc3, 0x42,
-	0xbc, 0x0f, 0xa6, 0xa3, 0x59, 0x3e, 0x6a, 0x8a, 0x24, 0x7d, 0x77, 0xa8, 0x5e, 0x98, 0x4e, 0xcd,
-	0x47, 0x4d, 0x75, 0xee, 0x24, 0x31, 0x86, 0xe5, 0xb7, 0x61, 0x9c, 0x87, 0xc5, 0x41, 0x6d, 0x91,
-	0xe3, 0xcb, 0xbb, 0x50, 0x8c, 0x19, 0x04, 0x1e, 0xd8, 0x12, 0x0b, 0x11, 0x2b, 0xc1, 0xca, 0xe5,
-	0x48, 0xac, 0x08, 0xb7, 0x80, 0x6f, 0xd0, 0x19, 0x2c, 0xee, 0x77, 0x1c, 0x63, 0xbf, 0xa1, 0x7b,
-	0x26, 0x6f, 0x8e, 0x19, 0x2e, 0xd3, 0x2f, 0xc3, 0x24, 0x26, 0xc4, 0x61, 0xe3, 0xc0, 0x04, 0xfd,
-	0x5d, 0x33, 0xe5, 0x2b, 0x90, 0x0f, 0xdf, 0xcd, 0xd8, 0x69, 0x3c, 0x1c, 0x20, 0xe1, 0x2d, 0x31,
-	0x33, 0x5f, 0xd4, 0x2f, 0x46, 0x61, 0x8e, 0xc0, 0xc4, 0x39, 0x68, 0x08, 0x83, 0xb9, 0x06, 0x53,
-	0x81, 0xc1, 0x04, 0xe7, 0x0e, 0x10, 0x43, 0x35, 0x33, 0x72, 0x17, 0xcf, 0x45, 0xee, 0xe2, 0xd1,
-	0x4c, 0x3f, 0x1a, 0xcf, 0xf4, 0x6b, 0x50, 0x08, 0x9f, 0xef, 0xc2, 0x63, 0x42, 0x30, 0x56, 0x33,
-	0xa9, 0xaa, 0x62, 0x2f, 0x7c, 0xfc, 0xb4, 0x30, 0x1d, 0x7b, 0xcc, 0x93, 0xaf, 0x02, 0x88, 0xc7,
-	0x20, 0x8b, 0x75, 0x25, 0xe4, 0xd4, 0x3c, 0x1f, 0xa9, 0x99, 0x74, 0xa2, 0xc8, 0x73, 0x23, 0x4d,
-	0xec, 0x64, 0xa2, 0xf0, 0xa5, 0x91, 0xc4, 0x14, 0xda, 0x1e, 0x18, 0xbe, 0x5e, 0x50, 0xcc, 0x3c,
-	0xc5, 0x2c, 0x11, 0x50, 0xf0, 0xa6, 0x40, 0xf1, 0xef, 0xc3, 0x84, 0x78, 0x22, 0x84, 0x01, 0x9f,
-	0x08, 0x05, 0x41, 0xf4, 0x41, 0x73, 0x2a, 0xfe, 0xb9, 0xcb, 0x16, 0x14, 0x58, 0x93, 0x22, 0xff,
-	0x50, 0xa4, 0x30, 0xe0, 0x87, 0x22, 0x53, 0xb4, 0x7f, 0x91, 0x7f, 0x23, 0xf2, 0x06, 0xd0, 0x6f,
-	0x3c, 0x68, 0x72, 0x46, 0x9e, 0x66, 0x99, 0xc8, 0xf1, 0x2d, 0xbf, 0x43, 0x73, 0x74, 0x5e, 0x95,
-	0x09, 0xec, 0x29, 0x05, 0xd5, 0x38, 0x44, 0x7e, 0x0a, 0x33, 0x5d, 0x1e, 0xcb, 0xfb, 0xd6, 0xaa,
-	0xc3, 0xf9, 0xaa, 0x5a, 0x8c, 0xfb, 0xa9, 0xb2, 0x08, 0xf3, 0x71, 0x6b, 0xe3, 0x66, 0xf8, 0x23,
-	0x09, 0x2e, 0x8b, 0x1b, 0xcb, 0x05, 0xf7, 0xe3, 0x2a, 0x7f, 0x22, 0xc1, 0x95, 0xf4, 0xb5, 0xf0,
-	0x8b, 0xd3, 0x3d, 0x58, 0x6c, 0xb2, 0x71, 0xd6, 0x77, 0xa7, 0x59, 0x8e, 0x66, 0xe8, 0x46, 0x03,
-	0xf1, 0x65, 0xcd, 0x35, 0x23, 0x54, 0x35, 0x67, 0x8b, 0x80, 0xe4, 0x77, 0x60, 0x39, 0x41, 0x64,
-	0xea, 0xbe, 0x7e, 0xa8, 0x63, 0xc4, 0x7d, 0x67, 0x31, 0x4e, 0xb7, 0xcd, 0xa1, 0xca, 0x3f, 0x4a,
-	0xb0, 0x22, 0x16, 0xc4, 0x15, 0xf9, 0xd0, 0xc5, 0xd1, 0x57, 0xb8, 0x86, 0x8b, 0x7d, 0x4d, 0x37,
-	0x4d, 0x0f, 0x61, 0x2c, 0x74, 0x43, 0xc6, 0x1e, 0xb0, 0x21, 0xf9, 0x55, 0x28, 0x89, 0xc8, 0xa1,
-	0xd5, 0x5d, 0x4f, 0x23, 0x30, 0x3a, 0xe9, 0x98, 0x5a, 0xe4, 0x21, 0x64, 0xd7, 0xf5, 0x08, 0x53,
-	0xf9, 0x29, 0xc8, 0xe1, 0x75, 0x2d, 0xc0, 0x1d, 0xfa, 0xae, 0x10, 0x5e, 0x2d, 0x39, 0x63, 0xe5,
-	0xcf, 0x46, 0xc2, 0x2d, 0x8e, 0x49, 0xc1, 0xb5, 0xba, 0x01, 0xb3, 0x4e, 0xbb, 0x79, 0x88, 0x3c,
-	0xcd, 0xad, 0x6b, 0x74, 0x51, 0x4c, 0x94, 0x31, 0xb5, 0xc8, 0xc6, 0xdf, 0xab, 0xd3, 0x00, 0x86,
-	0xe5, 0xcb, 0x90, 0x17, 0xd2, 0xe0, 0xf2, 0xc8, 0x6a, 0x6e, 0x63, 0x4c, 0x9d, 0xe4, 0x52, 0x60,
-	0xf9, 0xbb, 0x30, 0x13, 0x5a, 0x0a, 0xdb, 0x95, 0x5e, 0x9f, 0xa7, 0x05, 0xb8, 0x44, 0x8c, 0xe0,
-	0xc5, 0x9c, 0x6e, 0x19, 0x4d, 0xbf, 0x45, 0x27, 0x36, 0x26, 0xbf, 0x09, 0x4b, 0x6c, 0x6e, 0xc3,
-	0x75, 0x7c, 0xcf, 0xb5, 0x6d, 0xe4, 0x89, 0xfe, 0xc8, 0x51, 0xaa, 0xf7, 0x05, 0x0a, 0xde, 0x0a,
-	0xa0, 0xbc, 0x09, 0x9f, 0xb8, 0x38, 0xdf, 0x1f, 0xd6, 0xd2, 0x21, 0x7e, 0x2a, 0x55, 0x28, 0x6d,
-	0xd9, 0x2e, 0x46, 0x54, 0x38, 0xb1, 0xa7, 0xd1, 0x50, 0xcf, 0x94, 0x20, 0x42, 0xbd, 0x32, 0x0f,
-	0x72, 0x14, 0x9f, 0x3b, 0xd0, 0xcf, 0x24, 0x28, 0xb1, 0x42, 0x76, 0xb4, 0x2c, 0x96, 0xcd, 0x46,
-	0xde, 0x85, 0x49, 0x92, 0xa5, 0x8e, 0x88, 0x6f, 0x8f, 0xd0, 0xce, 0xce, 0xd7, 0x7a, 0xf7, 0x8d,
-	0xb2, 0x27, 0x28, 0x46, 0xa1, 0x06, 0xb4, 0xd1, 0x3e, 0x96, 0x5c, 0xac, 0x8f, 0xe5, 0x0e, 0xcc,
-	0x9f, 0x58, 0xd8, 0x3a, 0xb4, 0x6c, 0xcb, 0xef, 0x44, 0xba, 0x3a, 0x58, 0xcc, 0x9f, 0x0b, 0x61,
-	0x41, 0xf7, 0x05, 0x11, 0x2d, 0x2a, 0x03, 0x17, 0xed, 0xc7, 0x12, 0x5c, 0x7d, 0x17, 0xf9, 0x91,
-	0x83, 0xd1, 0x63, 0xf6, 0xd1, 0x66, 0x90, 0x3f, 0x1f, 0xc1, 0x38, 0xed, 0xad, 0x22, 0x06, 0x93,
-	0xcb, 0xdc, 0xea, 0xec, 0x83, 0x16, 0xed, 0xc2, 0x52, 0x39, 0x0f, 0xe2, 0x4f, 0x3c, 0x0d, 0xd3,
-	0xde, 0x0a, 0x71, 0xa1, 0xe6, 0x63, 0xc4, 0x46, 0x94, 0xbf, 0x1a, 0x81, 0x4a, 0xd6, 0x92, 0xb8,
-	0x39, 0xff, 0xa1, 0x04, 0x25, 0xfe, 0x71, 0x29, 0xd6, 0x0e, 0x3b, 0xcc, 0xa2, 0xf9, 0xfa, 0x9e,
-	0x0d, 0xfe, 0xb5, 0x4a, 0x8f, 0x29, 0xaa, 0x62, 0x60, 0xb3, 0x43, 0x6d, 0x81, 0x1f, 0xd1, 0x9b,
-	0xf1, 0xd1, 0x95, 0xdf, 0x86, 0xf9, 0x34, 0xc4, 0xe8, 0x71, 0x75, 0x8c, 0x1d, 0x57, 0x1f, 0xc7,
-	0x8f, 0xab, 0x6f, 0x0d, 0xa9, 0xc5, 0x60, 0x7d, 0x91, 0x23, 0xeb, 0x47, 0xb0, 0xfa, 0x2e, 0xf2,
-	0xb7, 0x1f, 0xbd, 0xdf, 0x63, 0xf7, 0x3e, 0xe0, 0x9d, 0xf5, 0xe4, 0xfa, 0x22, 0x76, 0x70, 0xd8,
-	0xb9, 0x89, 0xc1, 0x50, 0x7f, 0xa5, 0xcd, 0xf6, 0xe4, 0x2f, 0xac, 0xfc, 0x81, 0x04, 0x6b, 0x3d,
-	0x26, 0xe7, 0xfb, 0xf4, 0x7d, 0x28, 0x45, 0xef, 0x50, 0x84, 0x5c, 0x2c, 0xe2, 0xde, 0x0b, 0x2c,
-	0x42, 0x8d, 0xde, 0xc8, 0xc8, 0x00, 0x56, 0xfe, 0x58, 0x82, 0x79, 0xda, 0xc1, 0x26, 0xa2, 0xe4,
-	0x10, 0x49, 0xed, 0xbd, 0xee, 0x32, 0xe1, 0xd7, 0xfa, 0x96, 0x09, 0xd3, 0xa6, 0x0a, 0x4b, 0x83,
-	0xc7, 0xb0, 0xd0, 0x85, 0xc0, 0xf5, 0xa0, 0xc2, 0x64, 0x57, 0xdb, 0xcc, 0x9b, 0xc3, 0x4e, 0xc5,
-	0x9b, 0x64, 0x02, 0x3e, 0x24, 0x93, 0xce, 0xab, 0x48, 0x6f, 0xb5, 0xec, 0xce, 0xd0, 0xd7, 0xe6,
-	0xfd, 0x6e, 0xc9, 0xdf, 0x49, 0xdd, 0x8d, 0xe8, 0x47, 0xd6, 0x6c, 0x3b, 0x92, 0xd3, 0x85, 0xd2,
-	0x2f, 0xc1, 0x42, 0x17, 0x02, 0x5f, 0xe9, 0xdf, 0x8c, 0xc0, 0xa2, 0x8a, 0x74, 0x73, 0xfb, 0xd1,
-	0xfb, 0xdd, 0xe6, 0xb9, 0x03, 0xa3, 0x41, 0x07, 0x70, 0x31, 0x5a, 0x1a, 0x4d, 0x0b, 0x92, 0xdb,
-	0x48, 0x37, 0x1f, 0x21, 0xdf, 0x47, 0x1e, 0x6d, 0x16, 0xa5, 0xad, 0x5b, 0x94, 0x3c, 0x71, 0x78,
-	0x8f, 0x84, 0xe2, 0xe4, 0xf1, 0x3f, 0x97, 0x76, 0xfc, 0x7f, 0x0b, 0xca, 0x96, 0x43, 0x30, 0xac,
-	0x13, 0xa4, 0x21, 0xc7, 0xd4, 0xb8, 0xa7, 0x87, 0x55, 0xb7, 0x85, 0x00, 0xbe, 0xe3, 0x98, 0x5c,
-	0x8e, 0x9a, 0x29, 0xbf, 0x06, 0xa5, 0xa6, 0x7e, 0x66, 0x35, 0xdb, 0x4d, 0xad, 0x45, 0xf0, 0xb1,
-	0xf5, 0x11, 0xa2, 0x59, 0x68, 0x4c, 0x9d, 0xe1, 0x80, 0x3d, 0xfd, 0x08, 0xed, 0x5b, 0x1f, 0x21,
-	0xf9, 0x15, 0x72, 0x29, 0x3f, 0xf3, 0x19, 0x22, 0x6b, 0x58, 0x1d, 0xa7, 0x0d, 0xab, 0xb4, 0x82,
-	0x47, 0xd0, 0xd8, 0xd7, 0x44, 0xff, 0x29, 0xc1, 0x52, 0x42, 0x61, 0xdc, 0x94, 0x5e, 0x92, 0xc6,
-	0x52, 0x3d, 0x73, 0xe4, 0x25, 0x7a, 0x66, 0x9a, 0xb0, 0xb9, 0x34, 0x61, 0xff, 0x4d, 0x82, 0xa5,
-	0xbd, 0xb6, 0x77, 0x84, 0xbe, 0x88, 0xe6, 0xa1, 0xac, 0x40, 0x39, 0x29, 0x9c, 0x68, 0x0b, 0x1a,
-	0x81, 0xa5, 0xc7, 0xe8, 0x0b, 0x2a, 0xf9, 0xe7, 0xe2, 0x18, 0x9b, 0x50, 0x4e, 0x2a, 0x8c, 0x3b,
-	0x46, 0x0a, 0x0f, 0x29, 0x8d, 0xc7, 0x5f, 0xd0, 0x4f, 0x55, 0xea, 0x1e, 0xc2, 0x8d, 0xa0, 0x09,
-	0x94, 0x18, 0xec, 0x10, 0xe1, 0xf3, 0x59, 0x77, 0xf8, 0xfc, 0x8d, 0x01, 0xc3, 0x67, 0xe6, 0xac,
-	0x61, 0x14, 0xa5, 0x5f, 0xaf, 0xa4, 0xe1, 0x31, 0x31, 0x37, 0x5b, 0x1f, 0x7f, 0x5a, 0xb9, 0xf4,
-	0xc9, 0xa7, 0x95, 0x4b, 0xbf, 0xfc, 0xb4, 0x22, 0xfd, 0xe0, 0x79, 0x45, 0xfa, 0xc9, 0xf3, 0x8a,
-	0xf4, 0xcf, 0xcf, 0x2b, 0xd2, 0xc7, 0xcf, 0x2b, 0xd2, 0xbf, 0x3f, 0xaf, 0x48, 0xff, 0xf1, 0xbc,
-	0x72, 0xe9, 0x97, 0xcf, 0x2b, 0xd2, 0x8f, 0x3f, 0xab, 0x5c, 0xfa, 0xf8, 0xb3, 0xca, 0xa5, 0x4f,
-	0x3e, 0xab, 0x5c, 0x7a, 0x76, 0xff, 0xc8, 0x0d, 0x97, 0x68, 0xb9, 0x3d, 0xff, 0x6d, 0xcc, 0xd7,
-	0xe3, 0x23, 0x87, 0xe3, 0xf4, 0x5f, 0x69, 0xdc, 0xfb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d,
-	0xf5, 0xb6, 0xf6, 0x75, 0x46, 0x00, 0x00,
+	0x60, 0x2e, 0x04, 0x07, 0x0e, 0xc4, 0x1c, 0xb8, 0x0c, 0x11, 0x04, 0xc7, 0x86, 0x53, 0x47, 0x70,
+	0xa1, 0xdd, 0x17, 0x88, 0x99, 0xc3, 0x1c, 0xb8, 0x12, 0x41, 0xfc, 0x2d, 0x97, 0xca, 0xcc, 0x5a,
+	0x2c, 0x37, 0x62, 0x9a, 0xbe, 0xa9, 0xfe, 0x5b, 0xfe, 0x7f, 0xef, 0xbf, 0xe5, 0xff, 0xf7, 0x5f,
+	0x0a, 0xbe, 0xe1, 0xa3, 0x66, 0xcb, 0xf5, 0x74, 0xfb, 0x36, 0x46, 0xde, 0x09, 0xf2, 0x6e, 0xeb,
+	0x2d, 0xeb, 0x76, 0xc3, 0xc2, 0xbe, 0xeb, 0x75, 0xc8, 0x88, 0x65, 0xa0, 0xdb, 0x27, 0x77, 0x6e,
+	0x7b, 0xe8, 0xc3, 0x36, 0xc2, 0xbe, 0xe6, 0x21, 0xdc, 0x72, 0x1d, 0x8c, 0xaa, 0x2d, 0xcf, 0xf5,
+	0x5d, 0x79, 0x5d, 0x50, 0x57, 0x19, 0x75, 0x55, 0x6f, 0x59, 0xd5, 0x38, 0x75, 0xf5, 0xe4, 0xce,
+	0xca, 0x8d, 0x60, 0x12, 0xc2, 0xdd, 0x70, 0x9b, 0x4d, 0xd7, 0x21, 0x5c, 0x9b, 0x08, 0x63, 0xfd,
+	0x88, 0x33, 0x5b, 0x59, 0x8f, 0x61, 0x71, 0x2e, 0x49, 0xb4, 0x9b, 0x31, 0x34, 0x5f, 0xc7, 0xc7,
+	0x1f, 0xb6, 0x51, 0x1b, 0x25, 0x11, 0xe3, 0xb3, 0x22, 0xa7, 0xdd, 0xc4, 0x04, 0xe9, 0xd4, 0xf5,
+	0x8e, 0xeb, 0xb6, 0x7b, 0xca, 0xb1, 0x5e, 0x89, 0x61, 0x09, 0x60, 0x92, 0xdb, 0xf5, 0x18, 0xde,
+	0x87, 0x6d, 0x94, 0xb6, 0xb6, 0xb8, 0x08, 0x75, 0xdd, 0xb2, 0xdb, 0x5e, 0xca, 0xca, 0xbe, 0xd2,
+	0x43, 0xe9, 0x49, 0xec, 0x57, 0xd3, 0xb0, 0x03, 0x71, 0x98, 0x36, 0x39, 0xea, 0xeb, 0x3d, 0x51,
+	0xbb, 0x24, 0xbf, 0xd9, 0x13, 0x99, 0x28, 0x96, 0x23, 0xde, 0x4a, 0x43, 0xcc, 0xd6, 0x54, 0x35,
+	0x0d, 0xdd, 0xd1, 0x9b, 0x08, 0xb7, 0x74, 0x23, 0x45, 0x1b, 0x6f, 0xa4, 0xe1, 0x7b, 0xa8, 0x65,
+	0x5b, 0x86, 0xee, 0x5b, 0x69, 0x96, 0xf2, 0x66, 0xea, 0x9e, 0xf5, 0x35, 0xd7, 0x95, 0xfb, 0x69,
+	0x33, 0xe9, 0x66, 0xd3, 0x72, 0xfa, 0xd2, 0x2a, 0x9f, 0x8e, 0xc1, 0xd5, 0x7d, 0x5f, 0xf7, 0xfc,
+	0xa7, 0x7c, 0xba, 0x9d, 0x33, 0x64, 0xb4, 0xc9, 0xfa, 0x54, 0x46, 0x20, 0xaf, 0x41, 0x21, 0x90,
+	0x52, 0xb3, 0xcc, 0xb2, 0xb4, 0x2a, 0x6d, 0xe4, 0xd5, 0xa9, 0x60, 0xac, 0x66, 0xca, 0x06, 0x4c,
+	0x63, 0xc2, 0x43, 0xe3, 0x93, 0x94, 0x47, 0x56, 0xa5, 0x8d, 0xa9, 0xbb, 0xdf, 0x0c, 0x54, 0x46,
+	0x1d, 0xa8, 0x4b, 0xa0, 0xea, 0xc9, 0x9d, 0x6a, 0xcf, 0x99, 0xd5, 0x02, 0x65, 0x2a, 0xd6, 0xd1,
+	0x80, 0x85, 0x96, 0xee, 0x21, 0xc7, 0xd7, 0x90, 0x40, 0xd4, 0x2c, 0xa7, 0xee, 0x96, 0x73, 0x74,
+	0xb2, 0xaf, 0x56, 0xd3, 0x9c, 0x36, 0xb0, 0x8d, 0x93, 0x3b, 0xd5, 0x3d, 0x4a, 0x1d, 0xcc, 0x52,
+	0x73, 0xea, 0xae, 0x3a, 0xd7, 0x4a, 0x0e, 0xca, 0x65, 0x98, 0xd0, 0x7d, 0xc2, 0xcd, 0x2f, 0x8f,
+	0xae, 0x4a, 0x1b, 0x63, 0xaa, 0xf8, 0x29, 0x7f, 0x0b, 0x6e, 0x0a, 0x8e, 0x91, 0x55, 0xa0, 0xb3,
+	0x96, 0xe5, 0xd1, 0x3d, 0xd5, 0x7c, 0xab, 0x89, 0xb0, 0xaf, 0x37, 0x5b, 0xe5, 0xb1, 0x55, 0x69,
+	0x23, 0xa7, 0xde, 0x38, 0xed, 0x16, 0x6e, 0x27, 0x40, 0x3e, 0x10, 0xb8, 0x72, 0x03, 0x96, 0x0d,
+	0xd7, 0xf1, 0x2d, 0xa7, 0x8d, 0x34, 0x1d, 0x6b, 0x0e, 0x3a, 0xd5, 0x2c, 0xc7, 0xf2, 0x2d, 0xdd,
+	0x77, 0xbd, 0xf2, 0xf8, 0xaa, 0xb4, 0x51, 0xbc, 0x7b, 0x2b, 0xae, 0x4b, 0x6a, 0xcf, 0x44, 0xa8,
+	0x2d, 0x4e, 0xf7, 0x00, 0x3f, 0x41, 0xa7, 0x35, 0x41, 0xa4, 0x2e, 0x1a, 0xa9, 0xe3, 0xf2, 0x63,
+	0x28, 0x09, 0x88, 0xa9, 0x71, 0x47, 0x2e, 0x4f, 0x50, 0x05, 0xae, 0xc6, 0x67, 0xe0, 0x40, 0x32,
+	0xc7, 0x2e, 0xfb, 0x53, 0x9d, 0x0d, 0x48, 0xf9, 0x88, 0xfc, 0x01, 0x2c, 0xda, 0x3a, 0xf6, 0x35,
+	0xc3, 0x6d, 0xb6, 0x6c, 0x44, 0x35, 0xe0, 0x21, 0xdc, 0xb6, 0xfd, 0xf2, 0x64, 0x1a, 0x4f, 0xee,
+	0xd4, 0x74, 0x2f, 0x3a, 0xb6, 0xab, 0x9b, 0x58, 0x9d, 0x27, 0xf4, 0x5b, 0x01, 0xb9, 0x4a, 0xa9,
+	0xe5, 0x47, 0x70, 0xbd, 0x6e, 0x79, 0xd8, 0xd7, 0x4c, 0x64, 0x58, 0x98, 0x2a, 0x56, 0xc7, 0xc7,
+	0xda, 0xa1, 0x6e, 0x1c, 0xbb, 0xf5, 0xba, 0x86, 0x91, 0xe1, 0x3a, 0x26, 0x2e, 0xe7, 0xe9, 0xee,
+	0x5c, 0xa3, 0xa8, 0xdb, 0x1c, 0xf3, 0x40, 0xc7, 0xc7, 0x9b, 0x0c, 0x6f, 0x9f, 0xa1, 0x29, 0x6f,
+	0x41, 0x25, 0xcb, 0xd0, 0x98, 0x2f, 0xc8, 0x0b, 0x30, 0xee, 0xb5, 0x9d, 0xd0, 0xba, 0xc7, 0xbc,
+	0xb6, 0x53, 0x33, 0x95, 0x9f, 0x4b, 0xb0, 0xf8, 0x2e, 0xf2, 0x1f, 0xb7, 0x7d, 0xfd, 0xd0, 0x46,
+	0xfb, 0xbe, 0xee, 0xa3, 0x21, 0xbc, 0xe2, 0x5d, 0xc8, 0x07, 0x36, 0xc2, 0x3d, 0xe2, 0xd5, 0x2c,
+	0x7d, 0x24, 0x97, 0x16, 0xd2, 0xca, 0xf7, 0x60, 0x11, 0x9d, 0xb5, 0x90, 0xe1, 0x23, 0x53, 0x73,
+	0xd0, 0x99, 0xaf, 0xa1, 0x13, 0xe2, 0x06, 0x96, 0x49, 0x4d, 0x3f, 0xa7, 0xce, 0x09, 0xe8, 0x13,
+	0x74, 0xe6, 0xef, 0x10, 0x58, 0xcd, 0x94, 0xdf, 0x80, 0x79, 0xa3, 0xed, 0x51, 0x7f, 0x39, 0xf4,
+	0x74, 0xc7, 0x68, 0x68, 0xbe, 0x7b, 0x8c, 0x1c, 0x6a, 0xd1, 0x05, 0x55, 0xe6, 0xb0, 0x4d, 0x0a,
+	0x3a, 0x20, 0x10, 0xe5, 0xe7, 0x00, 0x4b, 0x09, 0x69, 0xb9, 0x82, 0x62, 0xb2, 0x48, 0xe7, 0x90,
+	0xa5, 0x06, 0xd3, 0x81, 0x07, 0xf9, 0x9d, 0x16, 0xe2, 0x8a, 0xb9, 0xd1, 0x8f, 0xd9, 0x41, 0xa7,
+	0x85, 0xd4, 0xc2, 0x69, 0xe4, 0x97, 0xac, 0xc0, 0x74, 0x9a, 0x36, 0xa6, 0x9c, 0x88, 0x16, 0xde,
+	0x81, 0xe5, 0x96, 0x87, 0x4e, 0x2c, 0xb7, 0x8d, 0x35, 0x1a, 0x4d, 0x90, 0x19, 0xe2, 0x8f, 0x52,
+	0xfc, 0x45, 0x81, 0xb0, 0xcf, 0xe0, 0x82, 0xf4, 0x16, 0xcc, 0x51, 0xdb, 0x66, 0x86, 0x18, 0x10,
+	0x31, 0xbf, 0x9e, 0x25, 0xa0, 0x5d, 0x02, 0x11, 0xe8, 0x5b, 0x00, 0xd4, 0x46, 0x69, 0xd6, 0xa6,
+	0x4e, 0x9b, 0x90, 0x2a, 0x48, 0xea, 0x44, 0x30, 0x62, 0xa7, 0xef, 0x93, 0x1f, 0x6a, 0xde, 0x17,
+	0x7f, 0xca, 0x7b, 0x50, 0xc2, 0xbe, 0x65, 0x1c, 0x77, 0xb4, 0x08, 0xaf, 0x89, 0x21, 0x78, 0xcd,
+	0x30, 0xf2, 0x60, 0x40, 0xfe, 0x2a, 0x2c, 0x1a, 0xb6, 0x45, 0xd6, 0x6e, 0x5b, 0x87, 0x9e, 0xee,
+	0x75, 0xb4, 0x13, 0xe4, 0x11, 0x3f, 0xa1, 0x1e, 0x9a, 0x57, 0xe7, 0x19, 0xf4, 0x11, 0x03, 0x7e,
+	0xc0, 0x60, 0x11, 0xaa, 0x3a, 0xd2, 0xfd, 0xb6, 0x87, 0x02, 0xaa, 0x7c, 0x94, 0x6a, 0x97, 0x01,
+	0x05, 0xd5, 0x35, 0x98, 0xe2, 0x54, 0x56, 0xb3, 0x65, 0x97, 0x81, 0xa2, 0x02, 0x1b, 0xaa, 0x35,
+	0x5b, 0xb6, 0xfc, 0x0c, 0x5e, 0x4f, 0x88, 0xa7, 0x61, 0xa3, 0x81, 0xcc, 0xb6, 0x8d, 0x34, 0xdf,
+	0x65, 0x5b, 0x44, 0x83, 0xa8, 0xdb, 0xf6, 0xcb, 0x53, 0xd4, 0xbd, 0xd7, 0xbb, 0x44, 0xda, 0xe7,
+	0xf8, 0x07, 0x2e, 0xdd, 0xb0, 0x03, 0x86, 0x2c, 0x57, 0x61, 0x8e, 0xed, 0x11, 0x39, 0x6e, 0x84,
+	0xeb, 0x2d, 0x50, 0x1e, 0x25, 0x0a, 0xda, 0x27, 0x10, 0xb1, 0xd8, 0x2c, 0xff, 0x98, 0xce, 0xf2,
+	0x0f, 0xf9, 0x77, 0x61, 0x36, 0x92, 0xbe, 0x59, 0xee, 0x29, 0xae, 0xe6, 0x36, 0xa6, 0xee, 0xee,
+	0x57, 0x07, 0x3a, 0x30, 0x56, 0x33, 0xbc, 0xab, 0xaa, 0x86, 0x6c, 0x49, 0x02, 0xda, 0x71, 0x7c,
+	0xaf, 0xa3, 0xce, 0x78, 0xf1, 0x51, 0xf9, 0xdb, 0x50, 0x0c, 0x5c, 0x07, 0x13, 0xfa, 0xf2, 0x0c,
+	0x4d, 0x0d, 0xe9, 0x99, 0x2f, 0xc8, 0x10, 0x09, 0x77, 0x64, 0x73, 0x07, 0x6e, 0x48, 0x7f, 0xca,
+	0x4f, 0x61, 0x26, 0xc6, 0xbc, 0x8d, 0xcb, 0xb3, 0x94, 0x7b, 0x35, 0x23, 0xf1, 0xa4, 0xb2, 0x6d,
+	0x63, 0xb5, 0x18, 0xe5, 0xdb, 0xc6, 0xf2, 0x77, 0xa1, 0xc4, 0xf7, 0x42, 0x63, 0x0a, 0xb1, 0x10,
+	0x2e, 0x97, 0xa8, 0x49, 0xbf, 0xd1, 0x4b, 0x6d, 0x64, 0x0e, 0xbe, 0x57, 0x0f, 0x05, 0x9d, 0x3a,
+	0x7b, 0xd2, 0x35, 0x22, 0x7f, 0x13, 0xae, 0x58, 0xc4, 0xb5, 0xbb, 0xad, 0x0a, 0x39, 0x44, 0xcd,
+	0x66, 0x59, 0x5e, 0x95, 0x36, 0x26, 0xd5, 0xb2, 0x85, 0xf7, 0xe3, 0x56, 0xb4, 0xc3, 0xe0, 0x2b,
+	0xa7, 0x30, 0x9f, 0xa6, 0x7d, 0x79, 0x16, 0x72, 0xc7, 0xa8, 0xc3, 0xc3, 0x3a, 0xf9, 0x53, 0xae,
+	0xc1, 0xd8, 0x89, 0x6e, 0xb7, 0x45, 0xc4, 0xba, 0x97, 0xba, 0xf8, 0xc8, 0x9e, 0x11, 0x01, 0xba,
+	0x58, 0xab, 0x8c, 0xc3, 0xfd, 0x91, 0xb7, 0x25, 0xe5, 0x17, 0x12, 0x2c, 0xed, 0xb9, 0xb6, 0xfd,
+	0xff, 0x24, 0xb9, 0xfc, 0x77, 0x1e, 0xca, 0x49, 0x71, 0xbf, 0xcc, 0x2e, 0x5f, 0x66, 0x97, 0x5f,
+	0x89, 0xec, 0x92, 0x65, 0xf0, 0x85, 0xcc, 0x6c, 0xf1, 0x7b, 0x29, 0xd9, 0x62, 0x9a, 0x66, 0x8b,
+	0x83, 0x01, 0xb3, 0x45, 0x96, 0xbb, 0x0c, 0x98, 0x2e, 0x52, 0x03, 0x6f, 0xf1, 0xa5, 0x05, 0xde,
+	0x5f, 0xc9, 0x6c, 0x74, 0x71, 0xe1, 0xfe, 0x47, 0x12, 0x5c, 0x56, 0x11, 0x46, 0x7e, 0x57, 0x1e,
+	0xba, 0x80, 0x90, 0xaf, 0x54, 0xe0, 0x4a, 0xfa, 0x52, 0x98, 0x7d, 0x29, 0x9f, 0x8c, 0xc0, 0xaa,
+	0x8a, 0x0c, 0xd7, 0x33, 0xa3, 0x97, 0x2a, 0x1e, 0xc0, 0x86, 0x58, 0xf0, 0x6f, 0x82, 0x9c, 0xbc,
+	0x2d, 0x0f, 0xbf, 0xf2, 0x52, 0xe2, 0x0e, 0x4d, 0x62, 0x41, 0xe0, 0xd8, 0x41, 0x68, 0x06, 0x31,
+	0x54, 0x33, 0xe5, 0x25, 0x98, 0xa0, 0x41, 0x20, 0x88, 0xc3, 0xe3, 0xe4, 0x67, 0xcd, 0x94, 0xaf,
+	0x02, 0x88, 0x4a, 0x08, 0x0f, 0xb7, 0x79, 0x35, 0xcf, 0x47, 0x6a, 0xa6, 0xfc, 0x3d, 0x28, 0xb4,
+	0x5c, 0xdb, 0x0e, 0x0a, 0x19, 0x2c, 0xd2, 0x7e, 0xbd, 0x6f, 0x21, 0x83, 0xf8, 0xea, 0xae, 0xeb,
+	0x45, 0xf5, 0x25, 0xaa, 0x18, 0x53, 0x84, 0x21, 0xff, 0xa1, 0xfc, 0x6c, 0x02, 0xd6, 0x7a, 0xa8,
+	0x96, 0xe7, 0xc3, 0x44, 0x1a, 0x93, 0x5e, 0x38, 0x8d, 0xf5, 0x4c, 0x51, 0x23, 0x3d, 0x53, 0xd4,
+	0x57, 0x40, 0x16, 0x1a, 0x35, 0xbb, 0xd3, 0xe0, 0x6c, 0x00, 0x11, 0xd8, 0x1b, 0x30, 0x9b, 0x91,
+	0x02, 0x8b, 0x38, 0xce, 0x37, 0x91, 0x59, 0xc7, 0x92, 0x99, 0x35, 0x52, 0x82, 0x19, 0xa7, 0xd0,
+	0xa0, 0x04, 0xf3, 0x36, 0x94, 0x79, 0x94, 0x8f, 0x14, 0x60, 0xf8, 0x61, 0x6f, 0x82, 0x1e, 0xf6,
+	0x16, 0x19, 0x3c, 0xac, 0xb8, 0x30, 0xa8, 0xfc, 0x0c, 0xa6, 0x83, 0x72, 0x02, 0x0d, 0xc7, 0xac,
+	0x46, 0xf1, 0xb5, 0x7e, 0xc1, 0xf0, 0xc0, 0xd3, 0x1d, 0x4c, 0xb2, 0x8c, 0xd8, 0x32, 0xea, 0xdb,
+	0x05, 0x33, 0xf2, 0x4b, 0x3e, 0x82, 0xab, 0x29, 0x85, 0xa1, 0x48, 0x9a, 0xcd, 0x0f, 0x91, 0x66,
+	0x57, 0x12, 0x06, 0x1f, 0x66, 0xdc, 0x8c, 0x6b, 0x0e, 0x64, 0x5d, 0x73, 0xd6, 0xa0, 0x10, 0x4b,
+	0x58, 0x53, 0x34, 0x61, 0x4d, 0x1d, 0x46, 0x32, 0xd5, 0x6d, 0x98, 0x0b, 0xf7, 0x39, 0x2c, 0x60,
+	0x15, 0xa8, 0xde, 0x43, 0x13, 0x08, 0xcb, 0x55, 0xaf, 0x93, 0x73, 0x04, 0xdb, 0xea, 0x10, 0x7d,
+	0x9a, 0xdb, 0x05, 0x03, 0x84, 0xc8, 0x2e, 0x4c, 0x7c, 0xd8, 0x46, 0x3c, 0xf9, 0x90, 0xf4, 0xf7,
+	0xad, 0x01, 0xd3, 0x5f, 0x5f, 0x37, 0xa9, 0xbe, 0xcf, 0xf8, 0xb2, 0xfc, 0x27, 0x66, 0x59, 0xf9,
+	0x3e, 0x14, 0xa2, 0x80, 0x94, 0xd0, 0x7e, 0x3f, 0x1e, 0xda, 0xbb, 0x36, 0x85, 0xd6, 0xc0, 0xa3,
+	0x5e, 0x45, 0xb8, 0x75, 0xa2, 0xb1, 0x3c, 0x8c, 0x8f, 0x0f, 0x0c, 0xdf, 0x3a, 0xb1, 0xfc, 0xce,
+	0x97, 0xf1, 0x71, 0xb0, 0xf8, 0x18, 0xd5, 0x57, 0x6a, 0x7c, 0xfc, 0x97, 0x9c, 0x88, 0x8f, 0xa9,
+	0xaa, 0xe5, 0xf1, 0xf1, 0x09, 0xcc, 0x74, 0x45, 0x26, 0x1e, 0x21, 0xd7, 0xe3, 0x0b, 0x89, 0x38,
+	0x31, 0x3b, 0xb8, 0x74, 0x68, 0x7c, 0x51, 0x8b, 0xf1, 0xe8, 0x95, 0x6e, 0xd0, 0x23, 0x19, 0x06,
+	0x1d, 0x09, 0x4d, 0xb9, 0x78, 0x68, 0x7a, 0x04, 0xd7, 0x53, 0x1c, 0x49, 0x73, 0xeb, 0x9a, 0xdf,
+	0xb0, 0xb0, 0x16, 0xad, 0x29, 0xe7, 0xd4, 0x6b, 0x49, 0xc7, 0x7a, 0xaf, 0x7e, 0xd0, 0xb0, 0xf0,
+	0x03, 0xce, 0xed, 0x31, 0x94, 0x1a, 0x48, 0xf7, 0xfc, 0x43, 0xa4, 0xfb, 0x9a, 0x89, 0x7c, 0xdd,
+	0xb2, 0x31, 0xdd, 0x90, 0x41, 0xca, 0xaa, 0xb3, 0x01, 0xe9, 0x36, 0xa3, 0x4c, 0xe6, 0x94, 0xf1,
+	0x17, 0xce, 0x29, 0xb7, 0x22, 0x76, 0x1b, 0xd8, 0x33, 0x0d, 0xbe, 0xf9, 0xd0, 0x18, 0x9f, 0x08,
+	0x80, 0xf2, 0x53, 0x09, 0xae, 0xb3, 0xad, 0x8b, 0x79, 0x33, 0x2f, 0xfa, 0x0e, 0xe5, 0x31, 0x2e,
+	0xcc, 0xf2, 0x52, 0x33, 0xea, 0x7a, 0x6b, 0xd8, 0xee, 0x6b, 0x82, 0x03, 0x2c, 0x41, 0x9d, 0x11,
+	0xdc, 0x85, 0x3d, 0xfe, 0xb9, 0x04, 0x37, 0x7a, 0x13, 0x72, 0x93, 0xc4, 0x61, 0xfa, 0x13, 0x2f,
+	0x2c, 0xdc, 0x26, 0x1f, 0xbe, 0xac, 0x78, 0x47, 0xae, 0x5f, 0xb1, 0x01, 0xe5, 0x6f, 0x25, 0x12,
+	0x88, 0x12, 0xab, 0xdb, 0xd5, 0x2d, 0x7b, 0x28, 0xb5, 0x36, 0xa0, 0x58, 0xa7, 0x34, 0x5d, 0x4a,
+	0x7d, 0xf0, 0x22, 0x4a, 0x8d, 0xcd, 0xae, 0x4e, 0xd7, 0xa3, 0x3f, 0x95, 0xeb, 0xc4, 0xbd, 0x33,
+	0x49, 0xb8, 0x58, 0x3f, 0x95, 0x40, 0x49, 0x06, 0x81, 0x87, 0xc2, 0xa2, 0x87, 0x10, 0xac, 0x15,
+	0xf5, 0xa1, 0xb8, 0x6c, 0x5b, 0x03, 0xc8, 0xd6, 0x6f, 0x09, 0x11, 0x37, 0x13, 0x02, 0xee, 0x11,
+	0x5b, 0xef, 0x41, 0xc7, 0xcd, 0xe5, 0x55, 0x98, 0x35, 0x74, 0xc7, 0x40, 0x41, 0x24, 0x45, 0x6c,
+	0xfd, 0x93, 0xea, 0x0c, 0x1b, 0x57, 0xc5, 0x70, 0xd4, 0x7d, 0xa2, 0x3c, 0x2f, 0xc8, 0x7d, 0x7a,
+	0x2d, 0x21, 0xe9, 0x3e, 0xaf, 0x04, 0xde, 0x93, 0x41, 0x97, 0x34, 0xe4, 0x28, 0xe2, 0xff, 0xbe,
+	0x21, 0x67, 0xce, 0x9e, 0x6d, 0xc8, 0x69, 0x24, 0x5c, 0xac, 0xbf, 0xa3, 0x86, 0x9c, 0x94, 0x9f,
+	0xee, 0xf0, 0x50, 0x82, 0xfd, 0x16, 0x14, 0xe3, 0xf6, 0x32, 0x84, 0x15, 0xf7, 0x9b, 0x5f, 0x9d,
+	0x8e, 0x99, 0x9c, 0xb2, 0x9e, 0x6e, 0x6f, 0x01, 0x11, 0x17, 0xee, 0x9f, 0x46, 0xa0, 0xb2, 0x6f,
+	0x1d, 0x39, 0xba, 0x7d, 0x9e, 0xa7, 0xe3, 0x3a, 0x14, 0x31, 0x65, 0xd2, 0x25, 0xd8, 0xaf, 0xf7,
+	0x7f, 0x3b, 0xee, 0x39, 0xb7, 0x3a, 0xcd, 0xd8, 0x8a, 0xa5, 0x58, 0x70, 0x19, 0x9d, 0xf9, 0xc8,
+	0x23, 0x33, 0xa5, 0x1c, 0xba, 0x72, 0xc3, 0x1e, 0xba, 0x96, 0x05, 0xb7, 0x04, 0x88, 0x1c, 0xd1,
+	0x8d, 0x86, 0x65, 0x9b, 0xe1, 0x3c, 0xae, 0x63, 0x77, 0x68, 0xda, 0x9f, 0x54, 0x4b, 0x14, 0x24,
+	0x88, 0xde, 0x73, 0xec, 0x8e, 0xb2, 0x06, 0xd7, 0x32, 0x65, 0xe1, 0xba, 0xfe, 0x57, 0x09, 0x6e,
+	0x72, 0x1c, 0xcb, 0x6f, 0x9c, 0xfb, 0xbd, 0xfe, 0x87, 0x12, 0x2c, 0x73, 0xad, 0x9f, 0x5a, 0x7e,
+	0x43, 0x4b, 0x7b, 0xbc, 0x7f, 0x38, 0xe8, 0x06, 0xf4, 0x5b, 0x90, 0xba, 0x88, 0xe3, 0x88, 0xc2,
+	0xce, 0x1e, 0xc0, 0x46, 0x7f, 0x16, 0xbd, 0x1f, 0x68, 0xff, 0x41, 0x82, 0x6b, 0x2a, 0x6a, 0xba,
+	0x27, 0x88, 0x71, 0x7a, 0xc1, 0x62, 0xfa, 0xe7, 0x77, 0x10, 0x8f, 0x1f, 0xa7, 0x73, 0x5d, 0xc7,
+	0x69, 0x45, 0x21, 0x61, 0x2f, 0x6b, 0xf9, 0x7c, 0xef, 0xff, 0x5e, 0x82, 0xb5, 0x03, 0xe4, 0x35,
+	0x2d, 0x47, 0xf7, 0xd1, 0x79, 0x76, 0xdd, 0x85, 0x92, 0x2f, 0xf8, 0x74, 0x6d, 0xf6, 0x66, 0xdf,
+	0xcd, 0xee, 0xbb, 0x02, 0x75, 0x36, 0x60, 0x2e, 0x36, 0xf8, 0x06, 0x28, 0xbd, 0xc8, 0xb8, 0x7c,
+	0x7f, 0x2d, 0xc1, 0x55, 0x5a, 0x8e, 0x3a, 0x67, 0x07, 0x8a, 0x47, 0x78, 0x0c, 0xdd, 0x81, 0xd2,
+	0x73, 0x66, 0xb5, 0x40, 0x99, 0x0a, 0x79, 0xde, 0x82, 0x4a, 0x16, 0x7a, 0x6f, 0x33, 0xfd, 0xd3,
+	0x1c, 0xac, 0x73, 0x26, 0x2c, 0x8c, 0x9e, 0x47, 0xd4, 0x66, 0x46, 0x2a, 0xd8, 0x1d, 0x40, 0xd6,
+	0x01, 0x96, 0xd0, 0x95, 0x0d, 0xe4, 0x5f, 0x8b, 0x04, 0x4e, 0xde, 0x94, 0x92, 0x2c, 0x07, 0x95,
+	0x05, 0x4a, 0x4d, 0x60, 0x88, 0x42, 0x4e, 0x9f, 0xb8, 0x3b, 0xfa, 0xf9, 0xc7, 0xdd, 0xb1, 0xac,
+	0xb8, 0xbb, 0x01, 0xaf, 0xf4, 0xd3, 0x88, 0x48, 0x75, 0x12, 0x5c, 0x16, 0x0f, 0x03, 0x29, 0x25,
+	0xbe, 0x8b, 0x0d, 0x31, 0xaf, 0x41, 0xc9, 0xc2, 0x5a, 0xbc, 0x5d, 0x86, 0x6e, 0xcb, 0xa4, 0x3a,
+	0x63, 0xe1, 0xdd, 0x68, 0x6f, 0x8c, 0x52, 0x81, 0x2b, 0xe9, 0x72, 0x70, 0x41, 0xff, 0x6b, 0x84,
+	0x1c, 0xd8, 0xc8, 0xf1, 0x75, 0x8b, 0xa8, 0x2b, 0x98, 0xe4, 0x45, 0x0e, 0x9b, 0x9f, 0x9f, 0xc4,
+	0x6b, 0x50, 0x08, 0x2d, 0x31, 0x7c, 0x99, 0x0b, 0xc6, 0x6a, 0xa6, 0xfc, 0x0c, 0xe6, 0xc4, 0x59,
+	0xd4, 0x3c, 0x8f, 0xb9, 0xc9, 0x01, 0x97, 0x70, 0xfa, 0xbd, 0xe0, 0x14, 0x4d, 0x6b, 0x8f, 0xb4,
+	0xfc, 0x30, 0x36, 0x4c, 0xf9, 0x61, 0x26, 0x24, 0xa7, 0x03, 0xca, 0x4d, 0x12, 0x1e, 0x7a, 0x6a,
+	0x9d, 0xef, 0xcf, 0x5f, 0x4a, 0xb0, 0xba, 0x8d, 0xb0, 0xe1, 0x59, 0x87, 0xe7, 0x4a, 0x05, 0xdf,
+	0x86, 0x89, 0x61, 0x0f, 0xc8, 0xfd, 0xa6, 0x55, 0x05, 0x47, 0xe5, 0x27, 0x39, 0x58, 0xeb, 0x81,
+	0xcd, 0x43, 0xe5, 0x77, 0x60, 0x36, 0x2c, 0x94, 0x1a, 0xae, 0x53, 0xb7, 0x8e, 0xf8, 0x85, 0xf9,
+	0x4e, 0xfa, 0x5a, 0x52, 0x37, 0x68, 0x8b, 0x12, 0xaa, 0x33, 0x28, 0x3e, 0x20, 0x1f, 0xc1, 0x52,
+	0x4a, 0x3d, 0x96, 0x56, 0x7d, 0x99, 0xc0, 0xb7, 0x87, 0x98, 0x84, 0xd6, 0x7b, 0x17, 0x4e, 0xd3,
+	0x86, 0xe5, 0xef, 0x80, 0xdc, 0x42, 0x8e, 0x69, 0x39, 0x47, 0x9a, 0xce, 0x4e, 0xcb, 0x16, 0xc2,
+	0xe5, 0x1c, 0xad, 0x74, 0xde, 0xca, 0x9e, 0x63, 0x8f, 0xd1, 0x88, 0x03, 0x36, 0x9d, 0xa1, 0xd4,
+	0x8a, 0x0d, 0x5a, 0x08, 0xcb, 0xdf, 0x83, 0x59, 0xc1, 0x9d, 0xc6, 0x2f, 0x8f, 0xbe, 0xb1, 0xe7,
+	0xe2, 0xef, 0x51, 0x19, 0xbc, 0xe3, 0xb6, 0x44, 0x67, 0x98, 0x69, 0x45, 0x40, 0x1e, 0x72, 0x94,
+	0x1f, 0x4e, 0xc0, 0xa2, 0x78, 0xb4, 0x42, 0xd4, 0x16, 0xb1, 0xb0, 0xa2, 0x75, 0x28, 0x62, 0xb7,
+	0xed, 0x19, 0x48, 0x33, 0xec, 0x36, 0xf6, 0x91, 0xc7, 0xed, 0x68, 0x9a, 0x8d, 0x6e, 0xb1, 0xc1,
+	0x84, 0xb1, 0x8d, 0x0c, 0x1a, 0x08, 0x72, 0x2f, 0x21, 0x10, 0xdc, 0x80, 0x62, 0xd7, 0xfb, 0x39,
+	0xab, 0xad, 0x15, 0xea, 0xd1, 0xb7, 0xf3, 0x01, 0xdf, 0x1b, 0x44, 0x29, 0x9d, 0xbf, 0x37, 0xf0,
+	0x9f, 0xf2, 0xef, 0xa4, 0xbc, 0xe3, 0x4e, 0xd0, 0x2d, 0x50, 0x07, 0x2e, 0xec, 0xa4, 0x29, 0x78,
+	0xc0, 0x57, 0xdc, 0xfb, 0x30, 0xc1, 0x39, 0xa6, 0xb7, 0x54, 0x26, 0x63, 0x8c, 0x2a, 0x08, 0xe4,
+	0x87, 0x30, 0xe3, 0xa0, 0x53, 0x8d, 0x9c, 0x48, 0x04, 0x8f, 0xfc, 0x80, 0x3c, 0xa6, 0x1d, 0x74,
+	0xaa, 0xb6, 0xf9, 0x73, 0x6f, 0x87, 0xa4, 0xd6, 0xba, 0x4b, 0x6c, 0xe1, 0xb0, 0x5d, 0xaf, 0x23,
+	0x8f, 0xa9, 0x12, 0xd3, 0x57, 0x87, 0x49, 0xb5, 0x44, 0x41, 0x9b, 0x14, 0xc2, 0x44, 0xcc, 0x7a,
+	0xa5, 0x98, 0xca, 0x7a, 0xa5, 0xf8, 0x06, 0x5c, 0x16, 0x2b, 0xcd, 0x6e, 0xe2, 0x5a, 0x62, 0x6b,
+	0xda, 0x49, 0x50, 0xaf, 0x43, 0x91, 0x1d, 0xfe, 0x84, 0x85, 0xd0, 0xc7, 0x88, 0x49, 0x95, 0x1d,
+	0x09, 0x85, 0x25, 0xc9, 0x15, 0x98, 0x12, 0x93, 0x38, 0xa6, 0x41, 0x9f, 0xc2, 0x27, 0xd5, 0x3c,
+	0x63, 0xfa, 0xc4, 0x34, 0x2e, 0xee, 0x6d, 0x78, 0x19, 0x96, 0x12, 0x36, 0xc2, 0x03, 0xfe, 0x1f,
+	0x8d, 0xc1, 0x72, 0x00, 0x53, 0xf5, 0xd3, 0xb8, 0x8f, 0x5e, 0x68, 0x16, 0xfe, 0x81, 0x94, 0xe2,
+	0x19, 0xb9, 0x21, 0x9f, 0x78, 0x32, 0x24, 0x1b, 0xde, 0x39, 0x46, 0x7b, 0x17, 0xc6, 0xb7, 0x75,
+	0x5f, 0xdf, 0xb4, 0xdd, 0xc3, 0x9e, 0xce, 0x31, 0x36, 0x20, 0x8f, 0xa4, 0x73, 0xa4, 0x19, 0xed,
+	0xf8, 0x0b, 0x1a, 0xfb, 0x44, 0x4f, 0x63, 0xbf, 0x38, 0x2b, 0xbd, 0x02, 0x2b, 0x69, 0xfb, 0xc5,
+	0x0d, 0xf5, 0xf7, 0x73, 0x50, 0xee, 0x32, 0xe2, 0x0f, 0xee, 0xfe, 0x9f, 0xb0, 0xd3, 0x3a, 0x2c,
+	0xc4, 0xfb, 0x60, 0x3a, 0x9a, 0xe5, 0xa3, 0xa6, 0x48, 0xd2, 0x77, 0x87, 0xea, 0x85, 0xe9, 0xd4,
+	0x7c, 0xd4, 0x54, 0xe7, 0x4e, 0x12, 0x63, 0x58, 0x7e, 0x1b, 0xc6, 0x79, 0x58, 0x1c, 0xd4, 0x16,
+	0x39, 0xbe, 0xbc, 0x0b, 0xc5, 0x98, 0x41, 0xe0, 0x81, 0x2d, 0xb1, 0x10, 0xb1, 0x12, 0xac, 0x5c,
+	0x8e, 0xc4, 0x8a, 0x70, 0x0b, 0xf8, 0x06, 0x9d, 0xc1, 0xe2, 0x7e, 0xc7, 0x31, 0xf6, 0x1b, 0xba,
+	0x67, 0xf2, 0xe6, 0x98, 0xe1, 0x32, 0xfd, 0x32, 0x4c, 0x62, 0x42, 0x1c, 0x36, 0x0e, 0x4c, 0xd0,
+	0xdf, 0x35, 0x53, 0xbe, 0x02, 0xf9, 0xf0, 0xdd, 0x8c, 0x9d, 0xc6, 0xc3, 0x01, 0x12, 0xde, 0x12,
+	0x33, 0xf3, 0x45, 0xfd, 0x62, 0x14, 0xe6, 0x08, 0x4c, 0x9c, 0x83, 0x86, 0x30, 0x98, 0x6b, 0x30,
+	0x15, 0x18, 0x4c, 0x70, 0xee, 0x00, 0x31, 0x54, 0x33, 0x23, 0x77, 0xf1, 0x5c, 0xe4, 0x2e, 0x1e,
+	0xcd, 0xf4, 0xa3, 0xf1, 0x4c, 0xbf, 0x06, 0x85, 0xf0, 0xf9, 0x2e, 0x3c, 0x26, 0x04, 0x63, 0x35,
+	0x93, 0xaa, 0x2a, 0xf6, 0xc2, 0xc7, 0x4f, 0x0b, 0xd3, 0xb1, 0xc7, 0x3c, 0xf9, 0x2a, 0x80, 0x78,
+	0x0c, 0xb2, 0x58, 0x57, 0x42, 0x4e, 0xcd, 0xf3, 0x91, 0x9a, 0x49, 0x27, 0x8a, 0x3c, 0x37, 0xd2,
+	0xc4, 0x4e, 0x26, 0x0a, 0x5f, 0x1a, 0x49, 0x4c, 0xa1, 0xed, 0x81, 0xe1, 0xeb, 0x05, 0xc5, 0xcc,
+	0x53, 0xcc, 0x12, 0x01, 0x05, 0x6f, 0x0a, 0x14, 0xff, 0x3e, 0x4c, 0x88, 0x27, 0x42, 0x18, 0xf0,
+	0x89, 0x50, 0x10, 0x44, 0x1f, 0x34, 0xa7, 0xe2, 0x9f, 0xbb, 0x6c, 0x41, 0x81, 0x35, 0x29, 0xf2,
+	0x0f, 0x45, 0x0a, 0x03, 0x7e, 0x28, 0x32, 0x45, 0xfb, 0x17, 0xf9, 0x37, 0x22, 0x6f, 0x00, 0xfd,
+	0xc6, 0x83, 0x26, 0x67, 0xe4, 0x69, 0x96, 0x89, 0x1c, 0xdf, 0xf2, 0x3b, 0x34, 0x47, 0xe7, 0x55,
+	0x99, 0xc0, 0x9e, 0x52, 0x50, 0x8d, 0x43, 0xe4, 0xa7, 0x30, 0xd3, 0xe5, 0xb1, 0xbc, 0x6f, 0xad,
+	0x3a, 0x9c, 0xaf, 0xaa, 0xc5, 0xb8, 0x9f, 0x2a, 0x8b, 0x30, 0x1f, 0xb7, 0x36, 0x6e, 0x86, 0x3f,
+	0x92, 0xe0, 0xb2, 0xb8, 0xb1, 0x5c, 0x70, 0x3f, 0xae, 0xf2, 0x27, 0x12, 0x5c, 0x49, 0x5f, 0x0b,
+	0xbf, 0x38, 0xdd, 0x83, 0xc5, 0x26, 0x1b, 0x67, 0x7d, 0x77, 0x9a, 0xe5, 0x68, 0x86, 0x6e, 0x34,
+	0x10, 0x5f, 0xd6, 0x5c, 0x33, 0x42, 0x55, 0x73, 0xb6, 0x08, 0x48, 0x7e, 0x07, 0x96, 0x13, 0x44,
+	0xa6, 0xee, 0xeb, 0x87, 0x3a, 0x46, 0xdc, 0x77, 0x16, 0xe3, 0x74, 0xdb, 0x1c, 0xaa, 0xfc, 0xa3,
+	0x04, 0x2b, 0x62, 0x41, 0x5c, 0x91, 0x0f, 0x5d, 0x1c, 0x7d, 0x85, 0x6b, 0xb8, 0xd8, 0xd7, 0x74,
+	0xd3, 0xf4, 0x10, 0xc6, 0x42, 0x37, 0x64, 0xec, 0x01, 0x1b, 0x92, 0x5f, 0x85, 0x92, 0x88, 0x1c,
+	0x5a, 0xdd, 0xf5, 0x34, 0x02, 0xa3, 0x93, 0x8e, 0xa9, 0x45, 0x1e, 0x42, 0x76, 0x5d, 0x8f, 0x30,
+	0x95, 0x9f, 0x82, 0x1c, 0x5e, 0xd7, 0x02, 0xdc, 0xa1, 0xef, 0x0a, 0xe1, 0xd5, 0x92, 0x33, 0x56,
+	0xfe, 0x6c, 0x24, 0xdc, 0xe2, 0x98, 0x14, 0x5c, 0xab, 0x1b, 0x30, 0xeb, 0xb4, 0x9b, 0x87, 0xc8,
+	0xd3, 0xdc, 0xba, 0x46, 0x17, 0xc5, 0x44, 0x19, 0x53, 0x8b, 0x6c, 0xfc, 0xbd, 0x3a, 0x0d, 0x60,
+	0x58, 0xbe, 0x0c, 0x79, 0x21, 0x0d, 0x2e, 0x8f, 0xac, 0xe6, 0x36, 0xc6, 0xd4, 0x49, 0x2e, 0x05,
+	0x96, 0xbf, 0x0b, 0x33, 0xa1, 0xa5, 0xb0, 0x5d, 0xe9, 0xf5, 0x79, 0x5a, 0x80, 0x4b, 0xc4, 0x08,
+	0x5e, 0xcc, 0xe9, 0x96, 0xd1, 0xf4, 0x5b, 0x74, 0x62, 0x63, 0xf2, 0x9b, 0xb0, 0xc4, 0xe6, 0x36,
+	0x5c, 0xc7, 0xf7, 0x5c, 0xdb, 0x46, 0x9e, 0xe8, 0x8f, 0x1c, 0xa5, 0x7a, 0x5f, 0xa0, 0xe0, 0xad,
+	0x00, 0xca, 0x9b, 0xf0, 0x89, 0x8b, 0xf3, 0xfd, 0x61, 0x2d, 0x1d, 0xe2, 0xa7, 0x52, 0x85, 0xd2,
+	0x96, 0xed, 0x62, 0x44, 0x85, 0x13, 0x7b, 0x1a, 0x0d, 0xf5, 0x4c, 0x09, 0x22, 0xd4, 0x2b, 0xf3,
+	0x20, 0x47, 0xf1, 0xb9, 0x03, 0xfd, 0x4c, 0x82, 0x12, 0x2b, 0x64, 0x47, 0xcb, 0x62, 0xd9, 0x6c,
+	0xe4, 0x5d, 0x98, 0x24, 0x59, 0xea, 0x88, 0xf8, 0xf6, 0x08, 0xed, 0xec, 0x7c, 0xad, 0x77, 0xdf,
+	0x28, 0x7b, 0x82, 0x62, 0x14, 0x6a, 0x40, 0x1b, 0xed, 0x63, 0xc9, 0xc5, 0xfa, 0x58, 0xee, 0xc0,
+	0xfc, 0x89, 0x85, 0xad, 0x43, 0xcb, 0xb6, 0xfc, 0x4e, 0xa4, 0xab, 0x83, 0xc5, 0xfc, 0xb9, 0x10,
+	0x16, 0x74, 0x5f, 0x10, 0xd1, 0xa2, 0x32, 0x70, 0xd1, 0x7e, 0x2c, 0xc1, 0xd5, 0x77, 0x91, 0x1f,
+	0x39, 0x18, 0x3d, 0x66, 0x1f, 0x6d, 0x06, 0xf9, 0xf3, 0x11, 0x8c, 0xd3, 0xde, 0x2a, 0x62, 0x30,
+	0xb9, 0xcc, 0xad, 0xce, 0x3e, 0x68, 0xd1, 0x2e, 0x2c, 0x95, 0xf3, 0x20, 0xfe, 0xc4, 0xd3, 0x30,
+	0xed, 0xad, 0x10, 0x17, 0x6a, 0x3e, 0x46, 0x6c, 0x44, 0xf9, 0xab, 0x11, 0xa8, 0x64, 0x2d, 0x89,
+	0x9b, 0xf3, 0x1f, 0x4a, 0x50, 0xe2, 0x1f, 0x97, 0x62, 0xed, 0xb0, 0xc3, 0x2c, 0x9a, 0xaf, 0xef,
+	0xd9, 0xe0, 0x5f, 0xab, 0xf4, 0x98, 0xa2, 0x2a, 0x06, 0x36, 0x3b, 0xd4, 0x16, 0xf8, 0x11, 0xbd,
+	0x19, 0x1f, 0x5d, 0xf9, 0x6d, 0x98, 0x4f, 0x43, 0x8c, 0x1e, 0x57, 0xc7, 0xd8, 0x71, 0xf5, 0x71,
+	0xfc, 0xb8, 0xfa, 0xd6, 0x90, 0x5a, 0x0c, 0xd6, 0x17, 0x39, 0xb2, 0x7e, 0x04, 0xab, 0xef, 0x22,
+	0x7f, 0xfb, 0xd1, 0xfb, 0x3d, 0x76, 0xef, 0x03, 0xde, 0x59, 0x4f, 0xae, 0x2f, 0x62, 0x07, 0x87,
+	0x9d, 0x9b, 0x18, 0x0c, 0xf5, 0x57, 0xda, 0x6c, 0x4f, 0xfe, 0xc2, 0xca, 0x1f, 0x48, 0xb0, 0xd6,
+	0x63, 0x72, 0xbe, 0x4f, 0xdf, 0x87, 0x52, 0xf4, 0x0e, 0x45, 0xc8, 0xc5, 0x22, 0xee, 0xbd, 0xc0,
+	0x22, 0xd4, 0xe8, 0x8d, 0x8c, 0x0c, 0x60, 0xe5, 0x8f, 0x25, 0x98, 0xa7, 0x1d, 0x6c, 0x22, 0x4a,
+	0x0e, 0x91, 0xd4, 0xde, 0xeb, 0x2e, 0x13, 0x7e, 0xad, 0x6f, 0x99, 0x30, 0x6d, 0xaa, 0xb0, 0x34,
+	0x78, 0x0c, 0x0b, 0x5d, 0x08, 0x5c, 0x0f, 0x2a, 0x4c, 0x76, 0xb5, 0xcd, 0xbc, 0x39, 0xec, 0x54,
+	0xbc, 0x49, 0x26, 0xe0, 0x43, 0x32, 0xe9, 0xbc, 0x8a, 0xf4, 0x56, 0xcb, 0xee, 0x0c, 0x7d, 0x6d,
+	0xde, 0xef, 0x96, 0xfc, 0x9d, 0xd4, 0xdd, 0x88, 0x7e, 0x64, 0xcd, 0xb6, 0x23, 0x39, 0x5d, 0x28,
+	0xfd, 0x12, 0x2c, 0x74, 0x21, 0xf0, 0x95, 0xfe, 0xcd, 0x08, 0x2c, 0x30, 0x5b, 0xe9, 0xb6, 0xce,
+	0x1d, 0x18, 0x0d, 0x1a, 0x80, 0x8b, 0xd1, 0xca, 0x68, 0x5a, 0x8c, 0xdc, 0x46, 0xba, 0xf9, 0x08,
+	0xf9, 0x3e, 0xf2, 0x68, 0xaf, 0x28, 0xed, 0xdc, 0xa2, 0xe4, 0x89, 0xb3, 0x7b, 0x24, 0x12, 0x27,
+	0x4f, 0xff, 0xb9, 0xb4, 0xd3, 0xff, 0x5b, 0x50, 0xb6, 0x1c, 0x82, 0x61, 0x9d, 0x20, 0x0d, 0x39,
+	0xa6, 0xc6, 0x1d, 0x3d, 0x2c, 0xba, 0x2d, 0x04, 0xf0, 0x1d, 0xc7, 0xe4, 0x72, 0xd4, 0x4c, 0xf9,
+	0x35, 0x28, 0x35, 0xf5, 0x33, 0xab, 0xd9, 0x6e, 0x6a, 0x2d, 0x82, 0x8f, 0xad, 0x8f, 0x10, 0x4d,
+	0x42, 0x63, 0xea, 0x0c, 0x07, 0xec, 0xe9, 0x47, 0x68, 0xdf, 0xfa, 0x08, 0xc9, 0xaf, 0x90, 0x3b,
+	0xf9, 0x99, 0xcf, 0x10, 0x59, 0xbf, 0xea, 0x38, 0xed, 0x57, 0xa5, 0x05, 0x3c, 0x82, 0xc6, 0x3e,
+	0x26, 0xfa, 0x4f, 0xf6, 0x5d, 0x6e, 0x4c, 0x5f, 0xdc, 0x90, 0x5e, 0x92, 0xc2, 0x52, 0xfd, 0x72,
+	0xe4, 0x25, 0xfa, 0x65, 0x9a, 0xac, 0xb9, 0x34, 0x59, 0xff, 0x4d, 0x82, 0xa5, 0xbd, 0xb6, 0x77,
+	0x84, 0xbe, 0x88, 0xd6, 0xa1, 0xac, 0x40, 0x39, 0x29, 0x9c, 0x68, 0x0a, 0x1a, 0x81, 0xa5, 0xc7,
+	0xe8, 0x0b, 0x2a, 0xf9, 0xe7, 0xe2, 0x17, 0x9b, 0x50, 0x4e, 0x2a, 0x8c, 0x3b, 0x46, 0x0a, 0x0f,
+	0x29, 0x8d, 0xc7, 0x5f, 0xd0, 0x0f, 0x55, 0xea, 0x1e, 0xc2, 0x8d, 0xa0, 0x05, 0x94, 0x18, 0xec,
+	0x10, 0xc1, 0xf3, 0x59, 0x77, 0xf0, 0xfc, 0x8d, 0x01, 0x83, 0x67, 0xe6, 0xac, 0x61, 0x0c, 0xa5,
+	0xdf, 0xae, 0xa4, 0xe1, 0x31, 0x31, 0x37, 0x5b, 0x1f, 0x7f, 0x5a, 0xb9, 0xf4, 0xc9, 0xa7, 0x95,
+	0x4b, 0xbf, 0xfc, 0xb4, 0x22, 0xfd, 0xe0, 0x79, 0x45, 0xfa, 0xc9, 0xf3, 0x8a, 0xf4, 0xcf, 0xcf,
+	0x2b, 0xd2, 0xc7, 0xcf, 0x2b, 0xd2, 0xbf, 0x3f, 0xaf, 0x48, 0xff, 0xf1, 0xbc, 0x72, 0xe9, 0x97,
+	0xcf, 0x2b, 0xd2, 0x8f, 0x3f, 0xab, 0x5c, 0xfa, 0xf8, 0xb3, 0xca, 0xa5, 0x4f, 0x3e, 0xab, 0x5c,
+	0x7a, 0x76, 0xff, 0xc8, 0x0d, 0x97, 0x68, 0xb9, 0x3d, 0xff, 0x69, 0xcc, 0xd7, 0xe3, 0x23, 0x87,
+	0xe3, 0xf4, 0x1f, 0x69, 0xdc, 0xfb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0xa3, 0xc6, 0x7d,
+	0x73, 0x46, 0x00, 0x00,
 }
 
 func (this *StartWorkflowExecutionRequest) Equal(that interface{}) bool {
@@ -6986,14 +6986,14 @@ func (this *ReapplyEventsResponse) Equal(that interface{}) bool {
 	}
 	return true
 }
-func (this *ReadDLQMessagesRequest) Equal(that interface{}) bool {
+func (this *GetDLQMessagesRequest) Equal(that interface{}) bool {
 	if that == nil {
 		return this == nil
 	}
 
-	that1, ok := that.(*ReadDLQMessagesRequest)
+	that1, ok := that.(*GetDLQMessagesRequest)
 	if !ok {
-		that2, ok := that.(ReadDLQMessagesRequest)
+		that2, ok := that.(GetDLQMessagesRequest)
 		if ok {
 			that1 = &that2
 		} else {
@@ -7025,14 +7025,14 @@ func (this *ReadDLQMessagesRequest) Equal(that interface{}) bool {
 	}
 	return true
 }
-func (this *ReadDLQMessagesResponse) Equal(that interface{}) bool {
+func (this *GetDLQMessagesResponse) Equal(that interface{}) bool {
 	if that == nil {
 		return this == nil
 	}
 
-	that1, ok := that.(*ReadDLQMessagesResponse)
+	that1, ok := that.(*GetDLQMessagesResponse)
 	if !ok {
-		that2, ok := that.(ReadDLQMessagesResponse)
+		that2, ok := that.(GetDLQMessagesResponse)
 		if ok {
 			that1 = &that2
 		} else {
@@ -8260,12 +8260,12 @@ func (this *ReapplyEventsResponse) GoString() string {
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
-func (this *ReadDLQMessagesRequest) GoString() string {
+func (this *GetDLQMessagesRequest) GoString() string {
 	if this == nil {
 		return "nil"
 	}
 	s := make([]string, 0, 10)
-	s = append(s, "&historyservice.ReadDLQMessagesRequest{")
+	s = append(s, "&historyservice.GetDLQMessagesRequest{")
 	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
 	s = append(s, "ShardId: "+fmt.Sprintf("%#v", this.ShardId)+",\n")
 	s = append(s, "SourceCluster: "+fmt.Sprintf("%#v", this.SourceCluster)+",\n")
@@ -8275,12 +8275,12 @@ func (this *ReadDLQMessagesRequest) GoString() string {
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
-func (this *ReadDLQMessagesResponse) GoString() string {
+func (this *GetDLQMessagesResponse) GoString() string {
 	if this == nil {
 		return "nil"
 	}
 	s := make([]string, 0, 7)
-	s = append(s, "&historyservice.ReadDLQMessagesResponse{")
+	s = append(s, "&historyservice.GetDLQMessagesResponse{")
 	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
 	if this.ReplicationTasks != nil {
 		s = append(s, "ReplicationTasks: "+fmt.Sprintf("%#v", this.ReplicationTasks)+",\n")
@@ -11783,7 +11783,7 @@ func (m *ReapplyEventsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *ReadDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
+func (m *GetDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -11793,12 +11793,12 @@ func (m *ReadDLQMessagesRequest) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ReadDLQMessagesRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesRequest) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ReadDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -11840,7 +11840,7 @@ func (m *ReadDLQMessagesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *ReadDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
+func (m *GetDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -11850,12 +11850,12 @@ func (m *ReadDLQMessagesResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *ReadDLQMessagesResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *ReadDLQMessagesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *GetDLQMessagesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -13553,7 +13553,7 @@ func (m *ReapplyEventsResponse) Size() (n int) {
 	return n
 }
 
-func (m *ReadDLQMessagesRequest) Size() (n int) {
+func (m *GetDLQMessagesRequest) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -13582,7 +13582,7 @@ func (m *ReadDLQMessagesRequest) Size() (n int) {
 	return n
 }
 
-func (m *ReadDLQMessagesResponse) Size() (n int) {
+func (m *GetDLQMessagesResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -14616,11 +14616,11 @@ func (this *ReapplyEventsResponse) String() string {
 	}, "")
 	return s
 }
-func (this *ReadDLQMessagesRequest) String() string {
+func (this *GetDLQMessagesRequest) String() string {
 	if this == nil {
 		return "nil"
 	}
-	s := strings.Join([]string{`&ReadDLQMessagesRequest{`,
+	s := strings.Join([]string{`&GetDLQMessagesRequest{`,
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
 		`ShardId:` + fmt.Sprintf("%v", this.ShardId) + `,`,
 		`SourceCluster:` + fmt.Sprintf("%v", this.SourceCluster) + `,`,
@@ -14631,7 +14631,7 @@ func (this *ReadDLQMessagesRequest) String() string {
 	}, "")
 	return s
 }
-func (this *ReadDLQMessagesResponse) String() string {
+func (this *GetDLQMessagesResponse) String() string {
 	if this == nil {
 		return "nil"
 	}
@@ -14640,7 +14640,7 @@ func (this *ReadDLQMessagesResponse) String() string {
 		repeatedStringForReplicationTasks += strings.Replace(fmt.Sprintf("%v", f), "ReplicationTask", "v16.ReplicationTask", 1) + ","
 	}
 	repeatedStringForReplicationTasks += "}"
-	s := strings.Join([]string{`&ReadDLQMessagesResponse{`,
+	s := strings.Join([]string{`&GetDLQMessagesResponse{`,
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
 		`ReplicationTasks:` + repeatedStringForReplicationTasks + `,`,
 		`NextPageToken:` + fmt.Sprintf("%v", this.NextPageToken) + `,`,
@@ -24914,7 +24914,7 @@ func (m *ReapplyEventsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
+func (m *GetDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -24937,10 +24937,10 @@ func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ReadDLQMessagesRequest: wiretype end group for non-group")
+			return fmt.Errorf("proto: GetDLQMessagesRequest: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ReadDLQMessagesRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: GetDLQMessagesRequest: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -25109,7 +25109,7 @@ func (m *ReadDLQMessagesRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *ReadDLQMessagesResponse) Unmarshal(dAtA []byte) error {
+func (m *GetDLQMessagesResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -25132,10 +25132,10 @@ func (m *ReadDLQMessagesResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: ReadDLQMessagesResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: GetDLQMessagesResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ReadDLQMessagesResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: GetDLQMessagesResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
diff --git a/api/historyservice/v1/service.pb.go b/api/historyservice/v1/service.pb.go
index a6e6efcb080..26e7c542d2b 100644
--- a/api/historyservice/v1/service.pb.go
+++ b/api/historyservice/v1/service.pb.go
@@ -30,75 +30,75 @@ func init() {
 }
 
 var fileDescriptor_655983da427ae822 = []byte{
-	// 1075 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x99, 0xcd, 0x8b, 0x23, 0x45,
-	0x18, 0x87, 0x53, 0x17, 0x0f, 0x85, 0x9f, 0xad, 0xf8, 0xb1, 0x6a, 0x23, 0x82, 0xd7, 0x84, 0x99,
-	0xbd, 0xec, 0xee, 0xac, 0xee, 0xce, 0x24, 0x33, 0x99, 0xd9, 0x9d, 0x51, 0x27, 0x59, 0x56, 0xf0,
-	0x22, 0x35, 0x9d, 0x77, 0x27, 0xc5, 0xf4, 0x74, 0xb5, 0xdd, 0xd5, 0x59, 0x73, 0x13, 0x3c, 0x09,
-	0x1e, 0x44, 0x10, 0x04, 0x41, 0xf0, 0xa4, 0x08, 0x82, 0x20, 0x08, 0x82, 0x20, 0x08, 0x82, 0xc7,
-	0x39, 0xee, 0xd1, 0xc9, 0x5c, 0x3c, 0xee, 0x9f, 0x20, 0x49, 0xa7, 0x6a, 0x52, 0xdd, 0xd5, 0xa1,
-	0xaa, 0x3a, 0xb7, 0x99, 0xa4, 0x7e, 0x4f, 0x3f, 0xdd, 0x55, 0x95, 0xf7, 0x4d, 0x05, 0x5f, 0xe5,
-	0x70, 0x1a, 0xb3, 0x84, 0x84, 0xad, 0x14, 0x92, 0x11, 0x24, 0x2d, 0x12, 0xd3, 0xd6, 0x90, 0xa6,
-	0x9c, 0x25, 0xe3, 0xe9, 0x2b, 0x34, 0x80, 0xd6, 0x68, 0xad, 0x35, 0xff, 0xb3, 0x19, 0x27, 0x8c,
-	0x33, 0xef, 0x2d, 0x11, 0x6a, 0xe6, 0xa1, 0x26, 0x89, 0x69, 0x53, 0x0d, 0x35, 0x47, 0x6b, 0x57,
-	0x6e, 0x9a, 0xb1, 0x13, 0xf8, 0x38, 0x83, 0x94, 0x7f, 0x94, 0x40, 0x1a, 0xb3, 0x28, 0x9d, 0x5f,
-	0x64, 0xfd, 0xaf, 0x35, 0xfc, 0xf4, 0x6e, 0x3e, 0xb8, 0x9f, 0x0f, 0xf6, 0x7e, 0x40, 0xf8, 0xc5,
-	0x3e, 0x27, 0x09, 0xff, 0x80, 0x25, 0x27, 0x0f, 0x42, 0xf6, 0x70, 0xfb, 0x13, 0x08, 0x32, 0x4e,
-	0x59, 0xe4, 0x75, 0x9a, 0x46, 0x4e, 0x4d, 0x7d, 0xbc, 0x97, 0x2b, 0x5c, 0xd9, 0xae, 0x49, 0xc9,
-	0x6f, 0xe0, 0xcd, 0x86, 0xf7, 0x15, 0xc2, 0xcf, 0x74, 0x81, 0x1f, 0x64, 0x9c, 0x1c, 0x85, 0xd0,
-	0xe7, 0x84, 0x83, 0xf7, 0xb6, 0x21, 0xbc, 0x90, 0x13, 0x6e, 0xef, 0xb8, 0xc6, 0xa5, 0xd4, 0xd7,
-	0x08, 0x3f, 0xfb, 0x3e, 0x0b, 0x43, 0xc5, 0xca, 0x14, 0x5b, 0x0c, 0x0a, 0xad, 0x5b, 0xce, 0x79,
-	0xe9, 0xf5, 0x3d, 0xc2, 0x2f, 0xf4, 0x20, 0x05, 0xde, 0xe7, 0x34, 0x38, 0x19, 0xdf, 0x23, 0xe9,
-	0xc9, 0x61, 0x06, 0x19, 0x78, 0x5b, 0x86, 0x6c, 0x5d, 0x58, 0xf8, 0xb5, 0x6b, 0x31, 0xa4, 0xe3,
-	0x2f, 0x08, 0xbf, 0xd2, 0x83, 0x80, 0x25, 0x83, 0x0e, 0x04, 0x34, 0xa5, 0x2c, 0x9a, 0x8e, 0x9a,
-	0xad, 0x03, 0x18, 0x78, 0x5d, 0xe3, 0x8b, 0x54, 0x10, 0x84, 0xed, 0x6e, 0x7d, 0x90, 0x46, 0x79,
-	0x33, 0xe0, 0x74, 0x44, 0xf9, 0xd8, 0x5d, 0x59, 0x43, 0x70, 0x53, 0xd6, 0x82, 0xa4, 0xf2, 0xef,
-	0x08, 0xbf, 0x96, 0xff, 0xab, 0xdc, 0x5b, 0x9b, 0x9d, 0xc6, 0x21, 0x4c, 0xad, 0xef, 0x98, 0xcf,
-	0x66, 0x25, 0x44, 0x88, 0xdf, 0x5d, 0x09, 0xab, 0xf0, 0xb8, 0x4b, 0x43, 0x77, 0x08, 0x0d, 0xad,
-	0x1e, 0x77, 0x05, 0xc1, 0xfe, 0x71, 0x57, 0x82, 0xa4, 0xf2, 0x6f, 0x08, 0xbf, 0x5a, 0x9e, 0x96,
-	0x5d, 0x20, 0x09, 0x3f, 0x02, 0xc2, 0xbd, 0x3d, 0xe7, 0xa9, 0x95, 0x0c, 0xa1, 0x7d, 0x67, 0x15,
-	0x28, 0xdd, 0x3a, 0x59, 0x1c, 0xea, 0xbc, 0x4e, 0xb4, 0x10, 0xc7, 0x75, 0x52, 0xc1, 0xd2, 0xad,
-	0x93, 0xc5, 0xa1, 0x6e, 0xeb, 0xa4, 0x4c, 0x70, 0x5c, 0x27, 0x3a, 0x50, 0x61, 0x9d, 0x94, 0xef,
-	0x8e, 0x44, 0x01, 0x4c, 0xa5, 0xf7, 0x6a, 0x3c, 0xa1, 0x39, 0xc3, 0x7e, 0x9d, 0x2c, 0x41, 0x49,
-	0xf1, 0x9f, 0x10, 0x7e, 0xa9, 0x4f, 0x8f, 0x23, 0x12, 0x96, 0x3b, 0x06, 0xe3, 0x5a, 0xaf, 0xcf,
-	0x0b, 0xe1, 0x9d, 0xba, 0x18, 0x29, 0xfb, 0x37, 0xc2, 0x6f, 0xcc, 0x47, 0x51, 0x3e, 0xac, 0xe8,
-	0x73, 0xde, 0xb5, 0xbb, 0x5c, 0x25, 0x48, 0xe8, 0xbf, 0xb7, 0x32, 0x9e, 0xbc, 0x8f, 0x9f, 0x11,
-	0x7e, 0xb9, 0x07, 0xa7, 0x6c, 0x04, 0x79, 0x48, 0x69, 0x37, 0x76, 0x8c, 0xe7, 0x57, 0x0f, 0x10,
-	0xde, 0xdd, 0xda, 0x1c, 0xe9, 0xfb, 0x2b, 0xc2, 0x57, 0xee, 0x41, 0x72, 0x4a, 0x23, 0xc2, 0xa1,
-	0xfc, 0xc4, 0x4d, 0x37, 0x52, 0x35, 0x42, 0x38, 0xef, 0xad, 0x80, 0x24, 0xad, 0xa7, 0xbd, 0xf0,
-	0xac, 0x67, 0x71, 0xef, 0x85, 0xf5, 0x71, 0xdb, 0x5e, 0xb8, 0x8a, 0x22, 0x4d, 0xff, 0x44, 0xd8,
-	0x9f, 0x43, 0xf3, 0x2d, 0x5a, 0x36, 0xde, 0x37, 0xbe, 0xd6, 0x32, 0x8c, 0x30, 0x3f, 0x58, 0x11,
-	0x4d, 0x69, 0x50, 0xfb, 0xc1, 0x10, 0x06, 0x59, 0x08, 0x8b, 0x05, 0xd5, 0xb8, 0x41, 0xd5, 0x85,
-	0x6d, 0x1b, 0x54, 0x3d, 0x43, 0x3a, 0xfe, 0x81, 0xf0, 0xeb, 0x79, 0xf1, 0x6c, 0x0f, 0x69, 0x38,
-	0x90, 0xb7, 0x71, 0x59, 0x13, 0xef, 0x5a, 0x95, 0xe0, 0x0a, 0x8a, 0xb0, 0xde, 0x5f, 0x0d, 0x4c,
-	0xa9, 0x8a, 0x1d, 0x48, 0x83, 0x84, 0x1e, 0x69, 0xf6, 0xa0, 0xe9, 0x6e, 0xaf, 0x24, 0xd8, 0x56,
-	0xc5, 0x25, 0x20, 0xe5, 0x3b, 0x5e, 0x0f, 0xe2, 0x90, 0x06, 0x84, 0xc3, 0xf6, 0x08, 0x22, 0x9e,
-	0x1a, 0x7f, 0xc7, 0x2b, 0xe4, 0x6c, 0xbf, 0xe3, 0x95, 0xe2, 0x52, 0xea, 0x5b, 0x84, 0x3d, 0xf9,
-	0x6e, 0x8f, 0x3c, 0x9c, 0x7b, 0xdd, 0xb6, 0x05, 0xcb, 0xa8, 0x50, 0xdb, 0xac, 0x41, 0x90, 0x76,
-	0xdf, 0x20, 0xfc, 0x5c, 0xc1, 0xfd, 0xfe, 0xba, 0x77, 0xcb, 0xed, 0xae, 0xef, 0xaf, 0x0b, 0xb7,
-	0xdb, 0xee, 0x00, 0x65, 0x36, 0xfb, 0xe3, 0x28, 0xe8, 0x0f, 0x49, 0x32, 0x98, 0x96, 0x88, 0xcc,
-	0x7c, 0x36, 0x0b, 0x39, 0xdb, 0xd9, 0x2c, 0xc5, 0xa5, 0xd4, 0xe7, 0x08, 0x3f, 0x39, 0x7d, 0x57,
-	0xb4, 0x39, 0xde, 0x0d, 0x0b, 0xa4, 0x08, 0x09, 0x9d, 0x0d, 0xa7, 0xac, 0xf2, 0x21, 0x28, 0xb6,
-	0x85, 0x52, 0xd2, 0xb7, 0x2c, 0xf7, 0x94, 0xae, 0x9c, 0xb7, 0x6b, 0x31, 0xa4, 0xe3, 0x77, 0x08,
-	0x3f, 0x2f, 0x86, 0xcc, 0xcf, 0x8e, 0x76, 0x59, 0xca, 0xbd, 0x4d, 0x4b, 0xfc, 0x42, 0x56, 0x18,
-	0x6e, 0xd5, 0x41, 0x48, 0xc1, 0xcf, 0x10, 0xc6, 0xed, 0x90, 0xa5, 0x30, 0x9b, 0x6f, 0xef, 0x9a,
-	0x21, 0xf4, 0x32, 0x22, 0x74, 0xae, 0x3b, 0x24, 0x15, 0x8b, 0xbc, 0x31, 0x9a, 0x55, 0xb1, 0x6b,
-	0x56, 0xbd, 0xd4, 0x62, 0xed, 0xba, 0xee, 0x90, 0x54, 0x3a, 0x98, 0x2e, 0x70, 0xb1, 0x29, 0x29,
-	0x8b, 0x0e, 0x20, 0x4d, 0xc9, 0x31, 0xa4, 0xc6, 0x1d, 0x8c, 0x3e, 0x6e, 0xdb, 0xc1, 0x54, 0x51,
-	0x94, 0xe2, 0xd4, 0x05, 0xde, 0xd9, 0x3f, 0xd4, 0xc9, 0x76, 0xcd, 0x2f, 0xa3, 0x27, 0xd8, 0x16,
-	0xa7, 0x25, 0x20, 0xa9, 0xfc, 0x05, 0xc2, 0x4f, 0x1d, 0x66, 0x90, 0x8c, 0x45, 0x05, 0xf3, 0x4c,
-	0xb7, 0xbf, 0x92, 0x12, 0x6a, 0x37, 0xdd, 0xc2, 0x8a, 0x4e, 0x0f, 0x48, 0x1c, 0x87, 0xe3, 0x79,
-	0x45, 0xda, 0x30, 0x5e, 0x3a, 0x0b, 0x29, 0x5b, 0x9d, 0x42, 0xb8, 0x50, 0xba, 0xc9, 0xa0, 0xb3,
-	0x7f, 0x28, 0xa7, 0xd1, 0xbc, 0x74, 0x2b, 0x39, 0xfb, 0xd2, 0x5d, 0x88, 0xab, 0xc7, 0xb3, 0x59,
-	0x72, 0x0c, 0x8b, 0x56, 0xc6, 0xc7, 0xb3, 0x85, 0xa0, 0xf5, 0xf1, 0x6c, 0x29, 0xaf, 0x78, 0x1d,
-	0x80, 0xa3, 0x57, 0x31, 0x68, 0xeb, 0x55, 0xce, 0x17, 0x8e, 0x8d, 0x1f, 0x24, 0x90, 0x0e, 0xc5,
-	0x8a, 0x9b, 0x7e, 0xc2, 0xa4, 0x16, 0xc7, 0xc6, 0xe5, 0xb0, 0xfd, 0xb1, 0xb1, 0x8e, 0x21, 0x1c,
-	0xb7, 0xe2, 0xb3, 0x73, 0xbf, 0xf1, 0xe8, 0xdc, 0x6f, 0x3c, 0x3e, 0xf7, 0xd1, 0xa7, 0x13, 0x1f,
-	0xfd, 0x38, 0xf1, 0xd1, 0x3f, 0x13, 0x1f, 0x9d, 0x4d, 0x7c, 0xf4, 0xef, 0xc4, 0x47, 0xff, 0x4d,
-	0xfc, 0xc6, 0xe3, 0x89, 0x8f, 0xbe, 0xbc, 0xf0, 0x1b, 0x67, 0x17, 0x7e, 0xe3, 0xd1, 0x85, 0xdf,
-	0xf8, 0xf0, 0xc6, 0x31, 0xbb, 0xbc, 0x3c, 0x65, 0x4b, 0x7f, 0x3e, 0xd9, 0x50, 0x5f, 0x39, 0x7a,
-	0x62, 0xf6, 0xeb, 0xc9, 0xd5, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x22, 0xf9, 0x48, 0x65, 0xd9,
-	0x19, 0x00, 0x00,
+	// 1076 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x99, 0xcf, 0x6b, 0x24, 0x45,
+	0x14, 0xc7, 0xa7, 0x2e, 0x1e, 0x0a, 0x5d, 0xb5, 0x15, 0x7f, 0x44, 0x6d, 0x44, 0xf0, 0x3a, 0x21,
+	0xd9, 0xcb, 0xee, 0x26, 0xeb, 0x6e, 0x32, 0x49, 0x26, 0xd9, 0x4d, 0xd4, 0xcc, 0x2c, 0x2b, 0x78,
+	0x91, 0x4a, 0xcf, 0xdb, 0x4c, 0x91, 0x4e, 0x57, 0xdb, 0x5d, 0x3d, 0xeb, 0xdc, 0x04, 0x4f, 0x82,
+	0xa0, 0x08, 0x82, 0x20, 0x08, 0x9e, 0x14, 0x41, 0x10, 0x04, 0x41, 0x10, 0xf6, 0x24, 0x78, 0xcc,
+	0x71, 0x8f, 0x66, 0x72, 0xf1, 0xb8, 0x7f, 0xc2, 0x32, 0xd3, 0x53, 0x95, 0xa9, 0xee, 0xea, 0xa1,
+	0xaa, 0x7a, 0x6e, 0xc9, 0x4c, 0x7d, 0x3f, 0xfd, 0xe9, 0xae, 0xaa, 0x79, 0x6f, 0x6a, 0xf0, 0x55,
+	0x0e, 0xa7, 0x31, 0x4b, 0x48, 0xb8, 0x9c, 0x42, 0x32, 0x80, 0x64, 0x99, 0xc4, 0x74, 0xb9, 0x4f,
+	0x53, 0xce, 0x92, 0xe1, 0xf8, 0x15, 0x1a, 0xc0, 0xf2, 0x60, 0x65, 0x79, 0xfa, 0x67, 0x33, 0x4e,
+	0x18, 0x67, 0xde, 0xbb, 0x22, 0xd4, 0xcc, 0x43, 0x4d, 0x12, 0xd3, 0xa6, 0x1a, 0x6a, 0x0e, 0x56,
+	0x96, 0xd6, 0xcd, 0xd8, 0x09, 0x7c, 0x9a, 0x41, 0xca, 0x3f, 0x49, 0x20, 0x8d, 0x59, 0x94, 0x4e,
+	0x2f, 0xb2, 0xfa, 0x68, 0x05, 0x5f, 0xd9, 0xcd, 0x07, 0x77, 0xf3, 0xc1, 0xde, 0xcf, 0x08, 0xbf,
+	0xd2, 0xe5, 0x24, 0xe1, 0x1f, 0xb1, 0xe4, 0xe4, 0x41, 0xc8, 0x1e, 0x6e, 0x7f, 0x06, 0x41, 0xc6,
+	0x29, 0x8b, 0xbc, 0xad, 0xa6, 0x91, 0x53, 0x53, 0x1f, 0xef, 0xe4, 0x0a, 0x4b, 0xdb, 0x35, 0x29,
+	0xf9, 0x0d, 0xbc, 0xd3, 0xf0, 0xbe, 0x45, 0xf8, 0xf9, 0x36, 0xf0, 0x83, 0x8c, 0x93, 0xa3, 0x10,
+	0xba, 0x9c, 0x70, 0xf0, 0x6e, 0x1a, 0xc2, 0x0b, 0x39, 0xe1, 0xf6, 0x9e, 0x6b, 0x5c, 0x4a, 0x7d,
+	0x87, 0xf0, 0x0b, 0x1f, 0xb2, 0x30, 0x54, 0xac, 0x4c, 0xb1, 0xc5, 0xa0, 0xd0, 0xba, 0xe5, 0x9c,
+	0x97, 0x5e, 0x3f, 0x21, 0xfc, 0x72, 0x07, 0x52, 0xe0, 0x5d, 0x4e, 0x83, 0x93, 0xe1, 0x3d, 0x92,
+	0x9e, 0x1c, 0x66, 0x90, 0x81, 0xb7, 0x69, 0xc8, 0xd6, 0x85, 0x85, 0x5f, 0xab, 0x16, 0x43, 0x3a,
+	0xfe, 0x8e, 0xf0, 0xeb, 0x1d, 0x08, 0x58, 0xd2, 0xdb, 0x82, 0x80, 0xa6, 0x94, 0x45, 0xe3, 0x51,
+	0x93, 0x75, 0x00, 0x3d, 0xaf, 0x6d, 0x7c, 0x91, 0x0a, 0x82, 0xb0, 0xdd, 0xad, 0x0f, 0xd2, 0x28,
+	0x6f, 0x04, 0x9c, 0x0e, 0x28, 0x1f, 0xba, 0x2b, 0x6b, 0x08, 0x6e, 0xca, 0x5a, 0x90, 0x54, 0xfe,
+	0x0b, 0xe1, 0x37, 0xf3, 0x7f, 0x95, 0x7b, 0x6b, 0xb1, 0xd3, 0x38, 0x84, 0xb1, 0xf5, 0x1d, 0xf3,
+	0xd9, 0xac, 0x84, 0x08, 0xf1, 0xbb, 0x0b, 0x61, 0x15, 0x1e, 0x77, 0x69, 0xe8, 0x0e, 0xa1, 0xa1,
+	0xd5, 0xe3, 0xae, 0x20, 0xd8, 0x3f, 0xee, 0x4a, 0x90, 0x54, 0xfe, 0x13, 0xe1, 0x37, 0xca, 0xd3,
+	0xb2, 0x0b, 0x24, 0xe1, 0x47, 0x40, 0xb8, 0xb7, 0xe7, 0x3c, 0xb5, 0x92, 0x21, 0xb4, 0xef, 0x2c,
+	0x02, 0xa5, 0x5b, 0x27, 0xb3, 0x43, 0x9d, 0xd7, 0x89, 0x16, 0xe2, 0xb8, 0x4e, 0x2a, 0x58, 0xba,
+	0x75, 0x32, 0x3b, 0xd4, 0x6d, 0x9d, 0x94, 0x09, 0x8e, 0xeb, 0x44, 0x07, 0x2a, 0xac, 0x93, 0xf2,
+	0xdd, 0x91, 0x28, 0x80, 0xb1, 0xf4, 0x5e, 0x8d, 0x27, 0x34, 0x65, 0xd8, 0xaf, 0x93, 0x39, 0x28,
+	0x29, 0xfe, 0x2b, 0xc2, 0xaf, 0x76, 0xe9, 0x71, 0x44, 0xc2, 0x72, 0xc7, 0x60, 0x5c, 0xeb, 0xf5,
+	0x79, 0x21, 0xbc, 0x53, 0x17, 0x23, 0x65, 0xff, 0x41, 0xf8, 0xed, 0xe9, 0x28, 0xca, 0xfb, 0x15,
+	0x7d, 0xce, 0xfb, 0x76, 0x97, 0xab, 0x04, 0x09, 0xfd, 0x0f, 0x16, 0xc6, 0x93, 0xf7, 0xf1, 0x1b,
+	0xc2, 0xaf, 0x75, 0xe0, 0x94, 0x0d, 0x20, 0x0f, 0x29, 0xed, 0xc6, 0x8e, 0xf1, 0xfc, 0xea, 0x01,
+	0xc2, 0xbb, 0x5d, 0x9b, 0x23, 0x7d, 0xff, 0x40, 0x78, 0xe9, 0x1e, 0x24, 0xa7, 0x34, 0x22, 0x1c,
+	0xca, 0x4f, 0xdc, 0x74, 0x23, 0x55, 0x23, 0x84, 0xf3, 0xde, 0x02, 0x48, 0xd2, 0x7a, 0xdc, 0x0b,
+	0x4f, 0x7a, 0x16, 0xf7, 0x5e, 0x58, 0x1f, 0xb7, 0xed, 0x85, 0xab, 0x28, 0xd2, 0xf4, 0x11, 0xc2,
+	0xfe, 0x14, 0x9a, 0x6f, 0xd1, 0xb2, 0xf1, 0xbe, 0xf1, 0xb5, 0xe6, 0x61, 0x84, 0xf9, 0xc1, 0x82,
+	0x68, 0x4a, 0x83, 0xda, 0x0d, 0xfa, 0xd0, 0xcb, 0x42, 0x98, 0x2d, 0xa8, 0xc6, 0x0d, 0xaa, 0x2e,
+	0x6c, 0xdb, 0xa0, 0xea, 0x19, 0xd2, 0xf1, 0x6f, 0x84, 0xdf, 0xca, 0x8b, 0x67, 0xab, 0x4f, 0xc3,
+	0x9e, 0xbc, 0x8d, 0xcb, 0x9a, 0x78, 0xd7, 0xaa, 0x04, 0x57, 0x50, 0x84, 0xf5, 0xfe, 0x62, 0x60,
+	0x4a, 0x55, 0xdc, 0x82, 0x34, 0x48, 0xe8, 0x91, 0x66, 0x0f, 0x9a, 0xee, 0xf6, 0x4a, 0x82, 0x6d,
+	0x55, 0x9c, 0x03, 0x52, 0xbe, 0xe3, 0x75, 0x20, 0x0e, 0x69, 0x40, 0x38, 0x6c, 0x0f, 0x20, 0xe2,
+	0xa9, 0xf1, 0x77, 0xbc, 0x42, 0xce, 0xf6, 0x3b, 0x5e, 0x29, 0x2e, 0xa5, 0x7e, 0x40, 0xd8, 0x93,
+	0xef, 0x76, 0xc8, 0xc3, 0xa9, 0xd7, 0x6d, 0x5b, 0xb0, 0x8c, 0x0a, 0xb5, 0x8d, 0x1a, 0x04, 0x69,
+	0xf7, 0x3d, 0xc2, 0x2f, 0x16, 0xdc, 0xef, 0xaf, 0x7a, 0xb7, 0xdc, 0xee, 0xfa, 0xfe, 0xaa, 0x70,
+	0xbb, 0xed, 0x0e, 0x50, 0x66, 0xb3, 0x3b, 0x8c, 0x82, 0x6e, 0x9f, 0x24, 0xbd, 0x71, 0x89, 0xc8,
+	0xcc, 0x67, 0xb3, 0x90, 0xb3, 0x9d, 0xcd, 0x52, 0x5c, 0x4a, 0x7d, 0x89, 0xf0, 0xb3, 0xe3, 0x77,
+	0x45, 0x9b, 0xe3, 0xdd, 0xb0, 0x40, 0x8a, 0x90, 0xd0, 0x59, 0x73, 0xca, 0x2a, 0x1f, 0x82, 0x62,
+	0x5b, 0x28, 0x25, 0x7d, 0xd3, 0x72, 0x4f, 0xe9, 0xca, 0x79, 0xab, 0x16, 0x43, 0x3a, 0xfe, 0x88,
+	0xf0, 0x4b, 0x62, 0xc8, 0xf4, 0xec, 0x68, 0x97, 0xa5, 0xdc, 0xdb, 0xb0, 0xc4, 0xcf, 0x64, 0x85,
+	0xe1, 0x66, 0x1d, 0x84, 0x14, 0xfc, 0x02, 0x61, 0xdc, 0x0a, 0x59, 0x0a, 0x93, 0xf9, 0xf6, 0xae,
+	0x19, 0x42, 0x2f, 0x23, 0x42, 0xe7, 0xba, 0x43, 0x52, 0xb1, 0xc8, 0x1b, 0xa3, 0x49, 0x15, 0xbb,
+	0x66, 0xd5, 0x4b, 0xcd, 0xd6, 0xae, 0xeb, 0x0e, 0x49, 0xa5, 0x83, 0x69, 0x03, 0x17, 0x9b, 0x92,
+	0xb2, 0xe8, 0x00, 0xd2, 0x94, 0x1c, 0x43, 0x6a, 0xdc, 0xc1, 0xe8, 0xe3, 0xb6, 0x1d, 0x4c, 0x15,
+	0x45, 0x29, 0x4e, 0x6d, 0xe0, 0x5b, 0xfb, 0x87, 0x3a, 0xd9, 0xb6, 0xf9, 0x65, 0xf4, 0x04, 0xdb,
+	0xe2, 0x34, 0x07, 0x24, 0x95, 0xbf, 0x42, 0xf8, 0xb9, 0xc3, 0x0c, 0x92, 0xa1, 0xa8, 0x60, 0x9e,
+	0xe9, 0xf6, 0x57, 0x52, 0x42, 0x6d, 0xdd, 0x2d, 0xac, 0xe8, 0x74, 0x80, 0xc4, 0x71, 0x38, 0x9c,
+	0x56, 0xa4, 0x35, 0xe3, 0xa5, 0x33, 0x93, 0xb2, 0xd5, 0x29, 0x84, 0xa5, 0xce, 0xd7, 0x08, 0x5f,
+	0xc9, 0x9f, 0xa2, 0x9c, 0xc5, 0x75, 0xab, 0x87, 0x5f, 0x9c, 0xba, 0x9b, 0x8e, 0x69, 0xf5, 0x6c,
+	0x36, 0x4b, 0x8e, 0x61, 0xd6, 0xc9, 0xf8, 0x6c, 0xb6, 0x10, 0xb4, 0x3e, 0x9b, 0x2d, 0xe5, 0x15,
+	0xaf, 0x03, 0x70, 0xf4, 0x2a, 0x06, 0x6d, 0xbd, 0xca, 0xf9, 0xc2, 0x99, 0xf1, 0x83, 0x04, 0xd2,
+	0xbe, 0x58, 0x6e, 0xe3, 0x8f, 0x97, 0xd4, 0xe2, 0xcc, 0xb8, 0x1c, 0xb6, 0x3f, 0x33, 0xd6, 0x31,
+	0x84, 0xe3, 0x66, 0x7c, 0x76, 0xee, 0x37, 0x1e, 0x9f, 0xfb, 0x8d, 0x27, 0xe7, 0x3e, 0xfa, 0x7c,
+	0xe4, 0xa3, 0x5f, 0x46, 0x3e, 0xfa, 0x77, 0xe4, 0xa3, 0xb3, 0x91, 0x8f, 0xfe, 0x1b, 0xf9, 0xe8,
+	0xff, 0x91, 0xdf, 0x78, 0x32, 0xf2, 0xd1, 0x37, 0x17, 0x7e, 0xe3, 0xec, 0xc2, 0x6f, 0x3c, 0xbe,
+	0xf0, 0x1b, 0x1f, 0xdf, 0x38, 0x66, 0x97, 0x97, 0xa7, 0x6c, 0xee, 0x6f, 0x27, 0x6b, 0xea, 0x2b,
+	0x47, 0xcf, 0x4c, 0x7e, 0x3a, 0xb9, 0xfa, 0x34, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x7d, 0xfa, 0xda,
+	0xd6, 0x19, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -179,6 +179,8 @@ type HistoryServiceClient interface {
 	// SignalWorkflowExecution is used to send a signal event to running workflow execution.  This results in
 	// WorkflowExecutionSignaled event recorded in the history and a decision task being created for the execution.
 	SignalWorkflowExecution(ctx context.Context, in *SignalWorkflowExecutionRequest, opts ...grpc.CallOption) (*SignalWorkflowExecutionResponse, error)
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: "With" is needed here. --)
 	// SignalWithStartWorkflowExecution is used to ensure sending a signal event to a workflow execution.
 	// If workflow is running, this results in WorkflowExecutionSignaled event recorded in the history
 	// and a decision task being created for the execution.
@@ -234,13 +236,13 @@ type HistoryServiceClient interface {
 	QueryWorkflow(ctx context.Context, in *QueryWorkflowRequest, opts ...grpc.CallOption) (*QueryWorkflowResponse, error)
 	// ReapplyEvents applies stale events to the current workflow and current run.
 	ReapplyEvents(ctx context.Context, in *ReapplyEventsRequest, opts ...grpc.CallOption) (*ReapplyEventsResponse, error)
-	// ReadDLQMessages returns messages from DLQ
-	ReadDLQMessages(ctx context.Context, in *ReadDLQMessagesRequest, opts ...grpc.CallOption) (*ReadDLQMessagesResponse, error)
-	// PurgeDLQMessages purges messages from DLQ
+	// GetDLQMessages returns messages from DLQ.
+	GetDLQMessages(ctx context.Context, in *GetDLQMessagesRequest, opts ...grpc.CallOption) (*GetDLQMessagesResponse, error)
+	// PurgeDLQMessages purges messages from DLQ.
 	PurgeDLQMessages(ctx context.Context, in *PurgeDLQMessagesRequest, opts ...grpc.CallOption) (*PurgeDLQMessagesResponse, error)
-	// MergeDLQMessages merges messages from DLQ
+	// MergeDLQMessages merges messages from DLQ.
 	MergeDLQMessages(ctx context.Context, in *MergeDLQMessagesRequest, opts ...grpc.CallOption) (*MergeDLQMessagesResponse, error)
-	// RefreshWorkflowTasks refreshes all tasks of a workflow
+	// RefreshWorkflowTasks refreshes all tasks of a workflow.
 	RefreshWorkflowTasks(ctx context.Context, in *RefreshWorkflowTasksRequest, opts ...grpc.CallOption) (*RefreshWorkflowTasksResponse, error)
 }
 
@@ -558,9 +560,9 @@ func (c *historyServiceClient) ReapplyEvents(ctx context.Context, in *ReapplyEve
 	return out, nil
 }
 
-func (c *historyServiceClient) ReadDLQMessages(ctx context.Context, in *ReadDLQMessagesRequest, opts ...grpc.CallOption) (*ReadDLQMessagesResponse, error) {
-	out := new(ReadDLQMessagesResponse)
-	err := c.cc.Invoke(ctx, "/temporal.server.api.historyservice.v1.HistoryService/ReadDLQMessages", in, out, opts...)
+func (c *historyServiceClient) GetDLQMessages(ctx context.Context, in *GetDLQMessagesRequest, opts ...grpc.CallOption) (*GetDLQMessagesResponse, error) {
+	out := new(GetDLQMessagesResponse)
+	err := c.cc.Invoke(ctx, "/temporal.server.api.historyservice.v1.HistoryService/GetDLQMessages", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -662,6 +664,8 @@ type HistoryServiceServer interface {
 	// SignalWorkflowExecution is used to send a signal event to running workflow execution.  This results in
 	// WorkflowExecutionSignaled event recorded in the history and a decision task being created for the execution.
 	SignalWorkflowExecution(context.Context, *SignalWorkflowExecutionRequest) (*SignalWorkflowExecutionResponse, error)
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: "With" is needed here. --)
 	// SignalWithStartWorkflowExecution is used to ensure sending a signal event to a workflow execution.
 	// If workflow is running, this results in WorkflowExecutionSignaled event recorded in the history
 	// and a decision task being created for the execution.
@@ -717,13 +721,13 @@ type HistoryServiceServer interface {
 	QueryWorkflow(context.Context, *QueryWorkflowRequest) (*QueryWorkflowResponse, error)
 	// ReapplyEvents applies stale events to the current workflow and current run.
 	ReapplyEvents(context.Context, *ReapplyEventsRequest) (*ReapplyEventsResponse, error)
-	// ReadDLQMessages returns messages from DLQ
-	ReadDLQMessages(context.Context, *ReadDLQMessagesRequest) (*ReadDLQMessagesResponse, error)
-	// PurgeDLQMessages purges messages from DLQ
+	// GetDLQMessages returns messages from DLQ.
+	GetDLQMessages(context.Context, *GetDLQMessagesRequest) (*GetDLQMessagesResponse, error)
+	// PurgeDLQMessages purges messages from DLQ.
 	PurgeDLQMessages(context.Context, *PurgeDLQMessagesRequest) (*PurgeDLQMessagesResponse, error)
-	// MergeDLQMessages merges messages from DLQ
+	// MergeDLQMessages merges messages from DLQ.
 	MergeDLQMessages(context.Context, *MergeDLQMessagesRequest) (*MergeDLQMessagesResponse, error)
-	// RefreshWorkflowTasks refreshes all tasks of a workflow
+	// RefreshWorkflowTasks refreshes all tasks of a workflow.
 	RefreshWorkflowTasks(context.Context, *RefreshWorkflowTasksRequest) (*RefreshWorkflowTasksResponse, error)
 }
 
@@ -833,8 +837,8 @@ func (*UnimplementedHistoryServiceServer) QueryWorkflow(ctx context.Context, req
 func (*UnimplementedHistoryServiceServer) ReapplyEvents(ctx context.Context, req *ReapplyEventsRequest) (*ReapplyEventsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ReapplyEvents not implemented")
 }
-func (*UnimplementedHistoryServiceServer) ReadDLQMessages(ctx context.Context, req *ReadDLQMessagesRequest) (*ReadDLQMessagesResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReadDLQMessages not implemented")
+func (*UnimplementedHistoryServiceServer) GetDLQMessages(ctx context.Context, req *GetDLQMessagesRequest) (*GetDLQMessagesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDLQMessages not implemented")
 }
 func (*UnimplementedHistoryServiceServer) PurgeDLQMessages(ctx context.Context, req *PurgeDLQMessagesRequest) (*PurgeDLQMessagesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PurgeDLQMessages not implemented")
@@ -1462,20 +1466,20 @@ func _HistoryService_ReapplyEvents_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
-func _HistoryService_ReadDLQMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReadDLQMessagesRequest)
+func _HistoryService_GetDLQMessages_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDLQMessagesRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(HistoryServiceServer).ReadDLQMessages(ctx, in)
+		return srv.(HistoryServiceServer).GetDLQMessages(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/temporal.server.api.historyservice.v1.HistoryService/ReadDLQMessages",
+		FullMethod: "/temporal.server.api.historyservice.v1.HistoryService/GetDLQMessages",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(HistoryServiceServer).ReadDLQMessages(ctx, req.(*ReadDLQMessagesRequest))
+		return srv.(HistoryServiceServer).GetDLQMessages(ctx, req.(*GetDLQMessagesRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1675,8 +1679,8 @@ var _HistoryService_serviceDesc = grpc.ServiceDesc{
 			Handler:    _HistoryService_ReapplyEvents_Handler,
 		},
 		{
-			MethodName: "ReadDLQMessages",
-			Handler:    _HistoryService_ReadDLQMessages_Handler,
+			MethodName: "GetDLQMessages",
+			Handler:    _HistoryService_GetDLQMessages_Handler,
 		},
 		{
 			MethodName: "PurgeDLQMessages",
diff --git a/api/historyservicemock/v1/service.pb.mock.go b/api/historyservicemock/v1/service.pb.mock.go
index 89125488265..316b83c023e 100644
--- a/api/historyservicemock/v1/service.pb.mock.go
+++ b/api/historyservicemock/v1/service.pb.mock.go
@@ -716,24 +716,24 @@ func (mr *MockHistoryServiceClientMockRecorder) ReapplyEvents(ctx, in interface{
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReapplyEvents", reflect.TypeOf((*MockHistoryServiceClient)(nil).ReapplyEvents), varargs...)
 }
 
-// ReadDLQMessages mocks base method.
-func (m *MockHistoryServiceClient) ReadDLQMessages(ctx context.Context, in *historyservice.ReadDLQMessagesRequest, opts ...grpc.CallOption) (*historyservice.ReadDLQMessagesResponse, error) {
+// GetDLQMessages mocks base method.
+func (m *MockHistoryServiceClient) GetDLQMessages(ctx context.Context, in *historyservice.GetDLQMessagesRequest, opts ...grpc.CallOption) (*historyservice.GetDLQMessagesResponse, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{ctx, in}
 	for _, a := range opts {
 		varargs = append(varargs, a)
 	}
-	ret := m.ctrl.Call(m, "ReadDLQMessages", varargs...)
-	ret0, _ := ret[0].(*historyservice.ReadDLQMessagesResponse)
+	ret := m.ctrl.Call(m, "GetDLQMessages", varargs...)
+	ret0, _ := ret[0].(*historyservice.GetDLQMessagesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ReadDLQMessages indicates an expected call of ReadDLQMessages.
-func (mr *MockHistoryServiceClientMockRecorder) ReadDLQMessages(ctx, in interface{}, opts ...interface{}) *gomock.Call {
+// GetDLQMessages indicates an expected call of GetDLQMessages.
+func (mr *MockHistoryServiceClientMockRecorder) GetDLQMessages(ctx, in interface{}, opts ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{ctx, in}, opts...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadDLQMessages", reflect.TypeOf((*MockHistoryServiceClient)(nil).ReadDLQMessages), varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDLQMessages", reflect.TypeOf((*MockHistoryServiceClient)(nil).GetDLQMessages), varargs...)
 }
 
 // PurgeDLQMessages mocks base method.
@@ -1329,19 +1329,19 @@ func (mr *MockHistoryServiceServerMockRecorder) ReapplyEvents(arg0, arg1 interfa
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReapplyEvents", reflect.TypeOf((*MockHistoryServiceServer)(nil).ReapplyEvents), arg0, arg1)
 }
 
-// ReadDLQMessages mocks base method.
-func (m *MockHistoryServiceServer) ReadDLQMessages(arg0 context.Context, arg1 *historyservice.ReadDLQMessagesRequest) (*historyservice.ReadDLQMessagesResponse, error) {
+// GetDLQMessages mocks base method.
+func (m *MockHistoryServiceServer) GetDLQMessages(arg0 context.Context, arg1 *historyservice.GetDLQMessagesRequest) (*historyservice.GetDLQMessagesResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ReadDLQMessages", arg0, arg1)
-	ret0, _ := ret[0].(*historyservice.ReadDLQMessagesResponse)
+	ret := m.ctrl.Call(m, "GetDLQMessages", arg0, arg1)
+	ret0, _ := ret[0].(*historyservice.GetDLQMessagesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ReadDLQMessages indicates an expected call of ReadDLQMessages.
-func (mr *MockHistoryServiceServerMockRecorder) ReadDLQMessages(arg0, arg1 interface{}) *gomock.Call {
+// GetDLQMessages indicates an expected call of GetDLQMessages.
+func (mr *MockHistoryServiceServerMockRecorder) GetDLQMessages(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadDLQMessages", reflect.TypeOf((*MockHistoryServiceServer)(nil).ReadDLQMessages), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDLQMessages", reflect.TypeOf((*MockHistoryServiceServer)(nil).GetDLQMessages), arg0, arg1)
 }
 
 // PurgeDLQMessages mocks base method.
diff --git a/api/matchingservice/v1/service.pb.go b/api/matchingservice/v1/service.pb.go
index c72c04dbf0a..e558d5d0f46 100644
--- a/api/matchingservice/v1/service.pb.go
+++ b/api/matchingservice/v1/service.pb.go
@@ -74,9 +74,13 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MatchingServiceClient interface {
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: TODO: Rename to PollWorkflowTaskQueue. --)
 	// PollForDecisionTask is called by frontend to process DecisionTask from a specific task queue.  A
 	// DecisionTask is dispatched to callers for active workflow executions, with pending decisions.
 	PollForDecisionTask(ctx context.Context, in *PollForDecisionTaskRequest, opts ...grpc.CallOption) (*PollForDecisionTaskResponse, error)
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: TODO: Rename to PollActivityTaskQueue. --)
 	// PollForActivityTask is called by frontend to process ActivityTask from a specific task queue.  ActivityTask
 	// is dispatched to callers whenever a ScheduleTask decision is made for a workflow execution.
 	PollForActivityTask(ctx context.Context, in *PollForActivityTaskRequest, opts ...grpc.CallOption) (*PollForActivityTaskResponse, error)
@@ -196,9 +200,13 @@ func (c *matchingServiceClient) ListTaskQueuePartitions(ctx context.Context, in
 
 // MatchingServiceServer is the server API for MatchingService service.
 type MatchingServiceServer interface {
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: TODO: Rename to PollWorkflowTaskQueue. --)
 	// PollForDecisionTask is called by frontend to process DecisionTask from a specific task queue.  A
 	// DecisionTask is dispatched to callers for active workflow executions, with pending decisions.
 	PollForDecisionTask(context.Context, *PollForDecisionTaskRequest) (*PollForDecisionTaskResponse, error)
+	// (-- api-linter: core::0136::prepositions=disabled
+	//     aip.dev/not-precedent: TODO: Rename to PollActivityTaskQueue. --)
 	// PollForActivityTask is called by frontend to process ActivityTask from a specific task queue.  ActivityTask
 	// is dispatched to callers whenever a ScheduleTask decision is made for a workflow execution.
 	PollForActivityTask(context.Context, *PollForActivityTaskRequest) (*PollForActivityTaskResponse, error)
diff --git a/api/namespace/v1/message.pb.go b/api/namespace/v1/message.pb.go
index 75bee882e6e..650891fe317 100644
--- a/api/namespace/v1/message.pb.go
+++ b/api/namespace/v1/message.pb.go
@@ -26,8 +26,12 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type NamespaceCacheInfo struct {
-	NumOfItemsInCacheById   int64 `protobuf:"varint,1,opt,name=num_of_items_in_cache_by_id,json=numOfItemsInCacheById,proto3" json:"num_of_items_in_cache_by_id,omitempty"`
-	NumOfItemsInCacheByName int64 `protobuf:"varint,2,opt,name=num_of_items_in_cache_by_name,json=numOfItemsInCacheByName,proto3" json:"num_of_items_in_cache_by_name,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "in" and "by" are needed here. --)
+	ItemsInCacheByIdCount int64 `protobuf:"varint,1,opt,name=items_in_cache_by_id_count,json=itemsInCacheByIdCount,proto3" json:"items_in_cache_by_id_count,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "in" and "by" are needed here. --)
+	ItemsInCacheByNameCount int64 `protobuf:"varint,2,opt,name=items_in_cache_by_name_count,json=itemsInCacheByNameCount,proto3" json:"items_in_cache_by_name_count,omitempty"`
 }
 
 func (m *NamespaceCacheInfo) Reset()      { *m = NamespaceCacheInfo{} }
@@ -62,16 +66,16 @@ func (m *NamespaceCacheInfo) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_NamespaceCacheInfo proto.InternalMessageInfo
 
-func (m *NamespaceCacheInfo) GetNumOfItemsInCacheById() int64 {
+func (m *NamespaceCacheInfo) GetItemsInCacheByIdCount() int64 {
 	if m != nil {
-		return m.NumOfItemsInCacheById
+		return m.ItemsInCacheByIdCount
 	}
 	return 0
 }
 
-func (m *NamespaceCacheInfo) GetNumOfItemsInCacheByName() int64 {
+func (m *NamespaceCacheInfo) GetItemsInCacheByNameCount() int64 {
 	if m != nil {
-		return m.NumOfItemsInCacheByName
+		return m.ItemsInCacheByNameCount
 	}
 	return 0
 }
@@ -85,23 +89,23 @@ func init() {
 }
 
 var fileDescriptor_bd829fe44a7a2771 = []byte{
-	// 254 bytes of a gzipped FileDescriptorProto
+	// 253 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2b, 0x49, 0xcd, 0x2d,
 	0xc8, 0x2f, 0x4a, 0xcc, 0xd1, 0x2f, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x4f, 0x2c, 0xc8, 0xd4,
 	0xcf, 0x4b, 0xcc, 0x4d, 0x2d, 0x2e, 0x48, 0x4c, 0x4e, 0xd5, 0x2f, 0x33, 0xd4, 0xcf, 0x4d, 0x2d,
 	0x2e, 0x4e, 0x4c, 0x4f, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0x80, 0xa9, 0xd7, 0x83,
-	0xa8, 0xd7, 0x4b, 0x2c, 0xc8, 0xd4, 0x83, 0xab, 0xd7, 0x2b, 0x33, 0x54, 0x9a, 0xc0, 0xc8, 0x25,
-	0xe4, 0x07, 0x13, 0x70, 0x4e, 0x4c, 0xce, 0x48, 0xf5, 0xcc, 0x4b, 0xcb, 0x17, 0xb2, 0xe2, 0x92,
-	0xce, 0x2b, 0xcd, 0x8d, 0xcf, 0x4f, 0x8b, 0xcf, 0x2c, 0x49, 0xcd, 0x2d, 0x8e, 0xcf, 0xcc, 0x8b,
-	0x4f, 0x06, 0x49, 0xc6, 0x27, 0x55, 0xc6, 0x67, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07,
-	0x89, 0xe6, 0x95, 0xe6, 0xfa, 0xa7, 0x79, 0x82, 0x14, 0x78, 0xe6, 0x81, 0xf5, 0x3a, 0x55, 0x7a,
-	0xa6, 0x08, 0xd9, 0x71, 0xc9, 0xe2, 0xd4, 0x0b, 0xb2, 0x5b, 0x82, 0x09, 0xac, 0x5b, 0x1c, 0x8b,
-	0x6e, 0x90, 0x4b, 0x9c, 0xd2, 0x2e, 0x3c, 0x94, 0x63, 0xb8, 0xf1, 0x50, 0x8e, 0xe1, 0xc3, 0x43,
-	0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, 0x2b, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1,
-	0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x2f, 0x1e, 0xc9, 0x31, 0x7c, 0x78, 0x24, 0xc7, 0x38,
-	0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa4, 0xe7,
-	0xc3, 0x43, 0x47, 0x2f, 0x33, 0x1f, 0x57, 0x00, 0x59, 0xc3, 0x39, 0x49, 0x6c, 0xe0, 0x30, 0x32,
-	0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xfe, 0x4e, 0xbd, 0x55, 0x01, 0x00, 0x00,
+	0xa8, 0xd7, 0x4b, 0x2c, 0xc8, 0xd4, 0x83, 0xab, 0xd7, 0x2b, 0x33, 0x54, 0xea, 0x63, 0xe4, 0x12,
+	0xf2, 0x83, 0x09, 0x38, 0x27, 0x26, 0x67, 0xa4, 0x7a, 0xe6, 0xa5, 0xe5, 0x0b, 0x59, 0x72, 0x49,
+	0x65, 0x96, 0xa4, 0xe6, 0x16, 0xc7, 0x67, 0xe6, 0xc5, 0x27, 0x83, 0x44, 0xe3, 0x93, 0x2a, 0xe3,
+	0x33, 0x53, 0xe2, 0x93, 0xf3, 0x4b, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x44,
+	0xc1, 0x2a, 0x3c, 0xf3, 0xc0, 0xba, 0x9c, 0x2a, 0x3d, 0x53, 0x9c, 0x41, 0x92, 0x42, 0xb6, 0x5c,
+	0x32, 0x98, 0x5a, 0x41, 0x76, 0x42, 0x35, 0x33, 0x81, 0x35, 0x8b, 0xa3, 0x6a, 0x06, 0x39, 0x01,
+	0xac, 0xdd, 0x29, 0xed, 0xc2, 0x43, 0x39, 0x86, 0x1b, 0x0f, 0xe5, 0x18, 0x3e, 0x3c, 0x94, 0x63,
+	0x6c, 0x78, 0x24, 0xc7, 0xb8, 0xe2, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9,
+	0x31, 0x3e, 0x78, 0x24, 0xc7, 0xf8, 0xe2, 0x91, 0x1c, 0xc3, 0x87, 0x47, 0x72, 0x8c, 0x13, 0x1e,
+	0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x41, 0x7a, 0x3e, 0x3c,
+	0x6c, 0xf4, 0x32, 0xf3, 0x71, 0x05, 0x8f, 0x35, 0x9c, 0x93, 0xc4, 0x06, 0x0e, 0x21, 0x63, 0x40,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x31, 0xe9, 0x71, 0x89, 0x53, 0x01, 0x00, 0x00,
 }
 
 func (this *NamespaceCacheInfo) Equal(that interface{}) bool {
@@ -123,10 +127,10 @@ func (this *NamespaceCacheInfo) Equal(that interface{}) bool {
 	} else if this == nil {
 		return false
 	}
-	if this.NumOfItemsInCacheById != that1.NumOfItemsInCacheById {
+	if this.ItemsInCacheByIdCount != that1.ItemsInCacheByIdCount {
 		return false
 	}
-	if this.NumOfItemsInCacheByName != that1.NumOfItemsInCacheByName {
+	if this.ItemsInCacheByNameCount != that1.ItemsInCacheByNameCount {
 		return false
 	}
 	return true
@@ -137,8 +141,8 @@ func (this *NamespaceCacheInfo) GoString() string {
 	}
 	s := make([]string, 0, 6)
 	s = append(s, "&namespace.NamespaceCacheInfo{")
-	s = append(s, "NumOfItemsInCacheById: "+fmt.Sprintf("%#v", this.NumOfItemsInCacheById)+",\n")
-	s = append(s, "NumOfItemsInCacheByName: "+fmt.Sprintf("%#v", this.NumOfItemsInCacheByName)+",\n")
+	s = append(s, "ItemsInCacheByIdCount: "+fmt.Sprintf("%#v", this.ItemsInCacheByIdCount)+",\n")
+	s = append(s, "ItemsInCacheByNameCount: "+fmt.Sprintf("%#v", this.ItemsInCacheByNameCount)+",\n")
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
@@ -170,13 +174,13 @@ func (m *NamespaceCacheInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.NumOfItemsInCacheByName != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.NumOfItemsInCacheByName))
+	if m.ItemsInCacheByNameCount != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.ItemsInCacheByNameCount))
 		i--
 		dAtA[i] = 0x10
 	}
-	if m.NumOfItemsInCacheById != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.NumOfItemsInCacheById))
+	if m.ItemsInCacheByIdCount != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.ItemsInCacheByIdCount))
 		i--
 		dAtA[i] = 0x8
 	}
@@ -200,11 +204,11 @@ func (m *NamespaceCacheInfo) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.NumOfItemsInCacheById != 0 {
-		n += 1 + sovMessage(uint64(m.NumOfItemsInCacheById))
+	if m.ItemsInCacheByIdCount != 0 {
+		n += 1 + sovMessage(uint64(m.ItemsInCacheByIdCount))
 	}
-	if m.NumOfItemsInCacheByName != 0 {
-		n += 1 + sovMessage(uint64(m.NumOfItemsInCacheByName))
+	if m.ItemsInCacheByNameCount != 0 {
+		n += 1 + sovMessage(uint64(m.ItemsInCacheByNameCount))
 	}
 	return n
 }
@@ -220,8 +224,8 @@ func (this *NamespaceCacheInfo) String() string {
 		return "nil"
 	}
 	s := strings.Join([]string{`&NamespaceCacheInfo{`,
-		`NumOfItemsInCacheById:` + fmt.Sprintf("%v", this.NumOfItemsInCacheById) + `,`,
-		`NumOfItemsInCacheByName:` + fmt.Sprintf("%v", this.NumOfItemsInCacheByName) + `,`,
+		`ItemsInCacheByIdCount:` + fmt.Sprintf("%v", this.ItemsInCacheByIdCount) + `,`,
+		`ItemsInCacheByNameCount:` + fmt.Sprintf("%v", this.ItemsInCacheByNameCount) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -265,9 +269,9 @@ func (m *NamespaceCacheInfo) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field NumOfItemsInCacheById", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ItemsInCacheByIdCount", wireType)
 			}
-			m.NumOfItemsInCacheById = 0
+			m.ItemsInCacheByIdCount = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -277,16 +281,16 @@ func (m *NamespaceCacheInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.NumOfItemsInCacheById |= int64(b&0x7F) << shift
+				m.ItemsInCacheByIdCount |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
 		case 2:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field NumOfItemsInCacheByName", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ItemsInCacheByNameCount", wireType)
 			}
-			m.NumOfItemsInCacheByName = 0
+			m.ItemsInCacheByNameCount = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -296,7 +300,7 @@ func (m *NamespaceCacheInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.NumOfItemsInCacheByName |= int64(b&0x7F) << shift
+				m.ItemsInCacheByNameCount |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/api/persistenceblobs/v1/message.pb.go b/api/persistenceblobs/v1/message.pb.go
index 359ab31703e..bafe9adca40 100644
--- a/api/persistenceblobs/v1/message.pb.go
+++ b/api/persistenceblobs/v1/message.pb.go
@@ -88,40 +88,46 @@ func (m *ImmutableClusterMetadata) GetHistoryShardCount() int32 {
 }
 
 type ActivityInfo struct {
-	Version                       int64            `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
-	ScheduledEventBatchId         int64            `protobuf:"varint,2,opt,name=scheduled_event_batch_id,json=scheduledEventBatchId,proto3" json:"scheduled_event_batch_id,omitempty"`
-	ScheduledEvent                []byte           `protobuf:"bytes,3,opt,name=scheduled_event,json=scheduledEvent,proto3" json:"scheduled_event,omitempty"`
-	ScheduledEventEncoding        string           `protobuf:"bytes,4,opt,name=scheduled_event_encoding,json=scheduledEventEncoding,proto3" json:"scheduled_event_encoding,omitempty"`
-	ScheduledTimeNanos            int64            `protobuf:"varint,5,opt,name=scheduled_time_nanos,json=scheduledTimeNanos,proto3" json:"scheduled_time_nanos,omitempty"`
-	StartedId                     int64            `protobuf:"varint,6,opt,name=started_id,json=startedId,proto3" json:"started_id,omitempty"`
-	StartedEvent                  []byte           `protobuf:"bytes,7,opt,name=started_event,json=startedEvent,proto3" json:"started_event,omitempty"`
-	StartedEventEncoding          string           `protobuf:"bytes,8,opt,name=started_event_encoding,json=startedEventEncoding,proto3" json:"started_event_encoding,omitempty"`
-	StartedTimeNanos              int64            `protobuf:"varint,9,opt,name=started_time_nanos,json=startedTimeNanos,proto3" json:"started_time_nanos,omitempty"`
-	ActivityId                    string           `protobuf:"bytes,10,opt,name=activity_id,json=activityId,proto3" json:"activity_id,omitempty"`
-	RequestId                     string           `protobuf:"bytes,11,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
-	ScheduleToStartTimeoutSeconds int32            `protobuf:"varint,12,opt,name=schedule_to_start_timeout_seconds,json=scheduleToStartTimeoutSeconds,proto3" json:"schedule_to_start_timeout_seconds,omitempty"`
-	ScheduleToCloseTimeoutSeconds int32            `protobuf:"varint,13,opt,name=schedule_to_close_timeout_seconds,json=scheduleToCloseTimeoutSeconds,proto3" json:"schedule_to_close_timeout_seconds,omitempty"`
-	StartToCloseTimeoutSeconds    int32            `protobuf:"varint,14,opt,name=start_to_close_timeout_seconds,json=startToCloseTimeoutSeconds,proto3" json:"start_to_close_timeout_seconds,omitempty"`
-	HeartbeatTimeoutSeconds       int32            `protobuf:"varint,15,opt,name=heartbeat_timeout_seconds,json=heartbeatTimeoutSeconds,proto3" json:"heartbeat_timeout_seconds,omitempty"`
-	CancelRequested               bool             `protobuf:"varint,16,opt,name=cancel_requested,json=cancelRequested,proto3" json:"cancel_requested,omitempty"`
-	CancelRequestId               int64            `protobuf:"varint,17,opt,name=cancel_request_id,json=cancelRequestId,proto3" json:"cancel_request_id,omitempty"`
-	TimerTaskStatus               int32            `protobuf:"varint,18,opt,name=timer_task_status,json=timerTaskStatus,proto3" json:"timer_task_status,omitempty"`
-	Attempt                       int32            `protobuf:"varint,19,opt,name=attempt,proto3" json:"attempt,omitempty"`
-	TaskQueue                     string           `protobuf:"bytes,20,opt,name=task_queue,json=taskQueue,proto3" json:"task_queue,omitempty"`
-	StartedIdentity               string           `protobuf:"bytes,21,opt,name=started_identity,json=startedIdentity,proto3" json:"started_identity,omitempty"`
-	HasRetryPolicy                bool             `protobuf:"varint,22,opt,name=has_retry_policy,json=hasRetryPolicy,proto3" json:"has_retry_policy,omitempty"`
-	RetryInitialIntervalSeconds   int32            `protobuf:"varint,23,opt,name=retry_initial_interval_seconds,json=retryInitialIntervalSeconds,proto3" json:"retry_initial_interval_seconds,omitempty"`
-	RetryMaximumIntervalSeconds   int32            `protobuf:"varint,24,opt,name=retry_maximum_interval_seconds,json=retryMaximumIntervalSeconds,proto3" json:"retry_maximum_interval_seconds,omitempty"`
-	RetryMaximumAttempts          int32            `protobuf:"varint,25,opt,name=retry_maximum_attempts,json=retryMaximumAttempts,proto3" json:"retry_maximum_attempts,omitempty"`
-	RetryExpirationTimeNanos      int64            `protobuf:"varint,26,opt,name=retry_expiration_time_nanos,json=retryExpirationTimeNanos,proto3" json:"retry_expiration_time_nanos,omitempty"`
-	RetryBackoffCoefficient       float64          `protobuf:"fixed64,27,opt,name=retry_backoff_coefficient,json=retryBackoffCoefficient,proto3" json:"retry_backoff_coefficient,omitempty"`
-	RetryNonRetryableErrorTypes   []string         `protobuf:"bytes,28,rep,name=retry_non_retryable_error_types,json=retryNonRetryableErrorTypes,proto3" json:"retry_non_retryable_error_types,omitempty"`
-	RetryLastFailure              *v1.Failure      `protobuf:"bytes,29,opt,name=retry_last_failure,json=retryLastFailure,proto3" json:"retry_last_failure,omitempty"`
-	RetryLastWorkerIdentity       string           `protobuf:"bytes,30,opt,name=retry_last_worker_identity,json=retryLastWorkerIdentity,proto3" json:"retry_last_worker_identity,omitempty"`
-	NamespaceId                   string           `protobuf:"bytes,31,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
-	ScheduleId                    int64            `protobuf:"varint,32,opt,name=schedule_id,json=scheduleId,proto3" json:"schedule_id,omitempty"`
-	LastHeartbeatDetails          *v11.Payloads    `protobuf:"bytes,33,opt,name=last_heartbeat_details,json=lastHeartbeatDetails,proto3" json:"last_heartbeat_details,omitempty"`
-	LastHeartbeatUpdatedTime      *types.Timestamp `protobuf:"bytes,34,opt,name=last_heartbeat_updated_time,json=lastHeartbeatUpdatedTime,proto3" json:"last_heartbeat_updated_time,omitempty"`
+	Version                int64  `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
+	ScheduledEventBatchId  int64  `protobuf:"varint,2,opt,name=scheduled_event_batch_id,json=scheduledEventBatchId,proto3" json:"scheduled_event_batch_id,omitempty"`
+	ScheduledEvent         []byte `protobuf:"bytes,3,opt,name=scheduled_event,json=scheduledEvent,proto3" json:"scheduled_event,omitempty"`
+	ScheduledEventEncoding string `protobuf:"bytes,4,opt,name=scheduled_event_encoding,json=scheduledEventEncoding,proto3" json:"scheduled_event_encoding,omitempty"`
+	ScheduledTimeNanos     int64  `protobuf:"varint,5,opt,name=scheduled_time_nanos,json=scheduledTimeNanos,proto3" json:"scheduled_time_nanos,omitempty"`
+	StartedId              int64  `protobuf:"varint,6,opt,name=started_id,json=startedId,proto3" json:"started_id,omitempty"`
+	StartedEvent           []byte `protobuf:"bytes,7,opt,name=started_event,json=startedEvent,proto3" json:"started_event,omitempty"`
+	StartedEventEncoding   string `protobuf:"bytes,8,opt,name=started_event_encoding,json=startedEventEncoding,proto3" json:"started_event_encoding,omitempty"`
+	StartedTimeNanos       int64  `protobuf:"varint,9,opt,name=started_time_nanos,json=startedTimeNanos,proto3" json:"started_time_nanos,omitempty"`
+	ActivityId             string `protobuf:"bytes,10,opt,name=activity_id,json=activityId,proto3" json:"activity_id,omitempty"`
+	RequestId              string `protobuf:"bytes,11,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "to" is used to indicate interval. --)
+	ScheduleToStartTimeoutSeconds int32 `protobuf:"varint,12,opt,name=schedule_to_start_timeout_seconds,json=scheduleToStartTimeoutSeconds,proto3" json:"schedule_to_start_timeout_seconds,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "to" is used to indicate interval. --)
+	ScheduleToCloseTimeoutSeconds int32 `protobuf:"varint,13,opt,name=schedule_to_close_timeout_seconds,json=scheduleToCloseTimeoutSeconds,proto3" json:"schedule_to_close_timeout_seconds,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "to" is used to indicate interval. --)
+	StartToCloseTimeoutSeconds  int32            `protobuf:"varint,14,opt,name=start_to_close_timeout_seconds,json=startToCloseTimeoutSeconds,proto3" json:"start_to_close_timeout_seconds,omitempty"`
+	HeartbeatTimeoutSeconds     int32            `protobuf:"varint,15,opt,name=heartbeat_timeout_seconds,json=heartbeatTimeoutSeconds,proto3" json:"heartbeat_timeout_seconds,omitempty"`
+	CancelRequested             bool             `protobuf:"varint,16,opt,name=cancel_requested,json=cancelRequested,proto3" json:"cancel_requested,omitempty"`
+	CancelRequestId             int64            `protobuf:"varint,17,opt,name=cancel_request_id,json=cancelRequestId,proto3" json:"cancel_request_id,omitempty"`
+	TimerTaskStatus             int32            `protobuf:"varint,18,opt,name=timer_task_status,json=timerTaskStatus,proto3" json:"timer_task_status,omitempty"`
+	Attempt                     int32            `protobuf:"varint,19,opt,name=attempt,proto3" json:"attempt,omitempty"`
+	TaskQueue                   string           `protobuf:"bytes,20,opt,name=task_queue,json=taskQueue,proto3" json:"task_queue,omitempty"`
+	StartedIdentity             string           `protobuf:"bytes,21,opt,name=started_identity,json=startedIdentity,proto3" json:"started_identity,omitempty"`
+	HasRetryPolicy              bool             `protobuf:"varint,22,opt,name=has_retry_policy,json=hasRetryPolicy,proto3" json:"has_retry_policy,omitempty"`
+	RetryInitialIntervalSeconds int32            `protobuf:"varint,23,opt,name=retry_initial_interval_seconds,json=retryInitialIntervalSeconds,proto3" json:"retry_initial_interval_seconds,omitempty"`
+	RetryMaximumIntervalSeconds int32            `protobuf:"varint,24,opt,name=retry_maximum_interval_seconds,json=retryMaximumIntervalSeconds,proto3" json:"retry_maximum_interval_seconds,omitempty"`
+	RetryMaximumAttempts        int32            `protobuf:"varint,25,opt,name=retry_maximum_attempts,json=retryMaximumAttempts,proto3" json:"retry_maximum_attempts,omitempty"`
+	RetryExpirationTimeNanos    int64            `protobuf:"varint,26,opt,name=retry_expiration_time_nanos,json=retryExpirationTimeNanos,proto3" json:"retry_expiration_time_nanos,omitempty"`
+	RetryBackoffCoefficient     float64          `protobuf:"fixed64,27,opt,name=retry_backoff_coefficient,json=retryBackoffCoefficient,proto3" json:"retry_backoff_coefficient,omitempty"`
+	RetryNonRetryableErrorTypes []string         `protobuf:"bytes,28,rep,name=retry_non_retryable_error_types,json=retryNonRetryableErrorTypes,proto3" json:"retry_non_retryable_error_types,omitempty"`
+	RetryLastFailure            *v1.Failure      `protobuf:"bytes,29,opt,name=retry_last_failure,json=retryLastFailure,proto3" json:"retry_last_failure,omitempty"`
+	RetryLastWorkerIdentity     string           `protobuf:"bytes,30,opt,name=retry_last_worker_identity,json=retryLastWorkerIdentity,proto3" json:"retry_last_worker_identity,omitempty"`
+	NamespaceId                 string           `protobuf:"bytes,31,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	ScheduleId                  int64            `protobuf:"varint,32,opt,name=schedule_id,json=scheduleId,proto3" json:"schedule_id,omitempty"`
+	LastHeartbeatDetails        *v11.Payloads    `protobuf:"bytes,33,opt,name=last_heartbeat_details,json=lastHeartbeatDetails,proto3" json:"last_heartbeat_details,omitempty"`
+	LastHeartbeatUpdateTime     *types.Timestamp `protobuf:"bytes,34,opt,name=last_heartbeat_update_time,json=lastHeartbeatUpdateTime,proto3" json:"last_heartbeat_update_time,omitempty"`
 }
 
 func (m *ActivityInfo) Reset()      { *m = ActivityInfo{} }
@@ -387,22 +393,24 @@ func (m *ActivityInfo) GetLastHeartbeatDetails() *v11.Payloads {
 	return nil
 }
 
-func (m *ActivityInfo) GetLastHeartbeatUpdatedTime() *types.Timestamp {
+func (m *ActivityInfo) GetLastHeartbeatUpdateTime() *types.Timestamp {
 	if m != nil {
-		return m.LastHeartbeatUpdatedTime
+		return m.LastHeartbeatUpdateTime
 	}
 	return nil
 }
 
 type ShardInfo struct {
-	ShardId                      int32                       `protobuf:"varint,1,opt,name=shard_id,json=shardId,proto3" json:"shard_id,omitempty"`
-	RangeId                      int64                       `protobuf:"varint,2,opt,name=range_id,json=rangeId,proto3" json:"range_id,omitempty"`
-	Owner                        string                      `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
-	ReplicationAckLevel          int64                       `protobuf:"varint,4,opt,name=replication_ack_level,json=replicationAckLevel,proto3" json:"replication_ack_level,omitempty"`
-	TransferAckLevel             int64                       `protobuf:"varint,5,opt,name=transfer_ack_level,json=transferAckLevel,proto3" json:"transfer_ack_level,omitempty"`
+	ShardId             int32  `protobuf:"varint,1,opt,name=shard_id,json=shardId,proto3" json:"shard_id,omitempty"`
+	RangeId             int64  `protobuf:"varint,2,opt,name=range_id,json=rangeId,proto3" json:"range_id,omitempty"`
+	Owner               string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"`
+	ReplicationAckLevel int64  `protobuf:"varint,4,opt,name=replication_ack_level,json=replicationAckLevel,proto3" json:"replication_ack_level,omitempty"`
+	TransferAckLevel    int64  `protobuf:"varint,5,opt,name=transfer_ack_level,json=transferAckLevel,proto3" json:"transfer_ack_level,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "since" is needed here. --)
 	StolenSinceRenew             int32                       `protobuf:"varint,6,opt,name=stolen_since_renew,json=stolenSinceRenew,proto3" json:"stolen_since_renew,omitempty"`
-	UpdatedAt                    *types.Timestamp            `protobuf:"bytes,7,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	TimerAckLevel                *types.Timestamp            `protobuf:"bytes,8,opt,name=timer_ack_level,json=timerAckLevel,proto3" json:"timer_ack_level,omitempty"`
+	UpdateTime                   *types.Timestamp            `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	TimerAckLevelTime            *types.Timestamp            `protobuf:"bytes,8,opt,name=timer_ack_level_time,json=timerAckLevelTime,proto3" json:"timer_ack_level_time,omitempty"`
 	NamespaceNotificationVersion int64                       `protobuf:"varint,9,opt,name=namespace_notification_version,json=namespaceNotificationVersion,proto3" json:"namespace_notification_version,omitempty"`
 	ClusterTransferAckLevel      map[string]int64            `protobuf:"bytes,10,rep,name=cluster_transfer_ack_level,json=clusterTransferAckLevel,proto3" json:"cluster_transfer_ack_level,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 	ClusterTimerAckLevel         map[string]*types.Timestamp `protobuf:"bytes,11,rep,name=cluster_timer_ack_level,json=clusterTimerAckLevel,proto3" json:"cluster_timer_ack_level,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -484,16 +492,16 @@ func (m *ShardInfo) GetStolenSinceRenew() int32 {
 	return 0
 }
 
-func (m *ShardInfo) GetUpdatedAt() *types.Timestamp {
+func (m *ShardInfo) GetUpdateTime() *types.Timestamp {
 	if m != nil {
-		return m.UpdatedAt
+		return m.UpdateTime
 	}
 	return nil
 }
 
-func (m *ShardInfo) GetTimerAckLevel() *types.Timestamp {
+func (m *ShardInfo) GetTimerAckLevelTime() *types.Timestamp {
 	if m != nil {
-		return m.TimerAckLevel
+		return m.TimerAckLevelTime
 	}
 	return nil
 }
@@ -699,7 +707,7 @@ type TimerTaskInfo struct {
 	ScheduleAttempt     int64                   `protobuf:"varint,8,opt,name=schedule_attempt,json=scheduleAttempt,proto3" json:"schedule_attempt,omitempty"`
 	EventId             int64                   `protobuf:"varint,9,opt,name=event_id,json=eventId,proto3" json:"event_id,omitempty"`
 	TaskId              int64                   `protobuf:"varint,10,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
-	VisibilityTimestamp *types.Timestamp        `protobuf:"bytes,11,opt,name=visibility_timestamp,json=visibilityTimestamp,proto3" json:"visibility_timestamp,omitempty"`
+	VisibilityTime      *types.Timestamp        `protobuf:"bytes,11,opt,name=visibility_time,json=visibilityTime,proto3" json:"visibility_time,omitempty"`
 }
 
 func (m *TimerTaskInfo) Reset()      { *m = TimerTaskInfo{} }
@@ -804,9 +812,9 @@ func (m *TimerTaskInfo) GetTaskId() int64 {
 	return 0
 }
 
-func (m *TimerTaskInfo) GetVisibilityTimestamp() *types.Timestamp {
+func (m *TimerTaskInfo) GetVisibilityTime() *types.Timestamp {
 	if m != nil {
-		return m.VisibilityTimestamp
+		return m.VisibilityTime
 	}
 	return nil
 }
@@ -824,7 +832,7 @@ type TransferTaskInfo struct {
 	ScheduleId              int64            `protobuf:"varint,10,opt,name=schedule_id,json=scheduleId,proto3" json:"schedule_id,omitempty"`
 	Version                 int64            `protobuf:"varint,11,opt,name=version,proto3" json:"version,omitempty"`
 	TaskId                  int64            `protobuf:"varint,12,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
-	VisibilityTimestamp     *types.Timestamp `protobuf:"bytes,13,opt,name=visibility_timestamp,json=visibilityTimestamp,proto3" json:"visibility_timestamp,omitempty"`
+	VisibilityTime          *types.Timestamp `protobuf:"bytes,13,opt,name=visibility_time,json=visibilityTime,proto3" json:"visibility_time,omitempty"`
 	RecordVisibility        bool             `protobuf:"varint,14,opt,name=record_visibility,json=recordVisibility,proto3" json:"record_visibility,omitempty"`
 }
 
@@ -944,9 +952,9 @@ func (m *TransferTaskInfo) GetTaskId() int64 {
 	return 0
 }
 
-func (m *TransferTaskInfo) GetVisibilityTimestamp() *types.Timestamp {
+func (m *TransferTaskInfo) GetVisibilityTime() *types.Timestamp {
 	if m != nil {
-		return m.VisibilityTimestamp
+		return m.VisibilityTime
 	}
 	return nil
 }
@@ -1223,8 +1231,8 @@ type TaskInfo struct {
 	WorkflowId  string           `protobuf:"bytes,2,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"`
 	RunId       string           `protobuf:"bytes,3,opt,name=run_id,json=runId,proto3" json:"run_id,omitempty"`
 	ScheduleId  int64            `protobuf:"varint,4,opt,name=schedule_id,json=scheduleId,proto3" json:"schedule_id,omitempty"`
-	CreatedTime *types.Timestamp `protobuf:"bytes,5,opt,name=created_time,json=createdTime,proto3" json:"created_time,omitempty"`
-	Expiry      *types.Timestamp `protobuf:"bytes,6,opt,name=expiry,proto3" json:"expiry,omitempty"`
+	CreateTime  *types.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	ExpiryTime  *types.Timestamp `protobuf:"bytes,6,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty"`
 }
 
 func (m *TaskInfo) Reset()      { *m = TaskInfo{} }
@@ -1287,16 +1295,16 @@ func (m *TaskInfo) GetScheduleId() int64 {
 	return 0
 }
 
-func (m *TaskInfo) GetCreatedTime() *types.Timestamp {
+func (m *TaskInfo) GetCreateTime() *types.Timestamp {
 	if m != nil {
-		return m.CreatedTime
+		return m.CreateTime
 	}
 	return nil
 }
 
-func (m *TaskInfo) GetExpiry() *types.Timestamp {
+func (m *TaskInfo) GetExpiryTime() *types.Timestamp {
 	if m != nil {
-		return m.Expiry
+		return m.ExpiryTime
 	}
 	return nil
 }
@@ -1353,13 +1361,13 @@ func (m *AllocatedTaskInfo) GetTaskId() int64 {
 }
 
 type TaskQueueInfo struct {
-	NamespaceId string            `protobuf:"bytes,1,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
-	Name        string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	TaskType    v14.TaskQueueType `protobuf:"varint,3,opt,name=task_type,json=taskType,proto3,enum=temporal.api.enums.v1.TaskQueueType" json:"task_type,omitempty"`
-	Kind        v14.TaskQueueKind `protobuf:"varint,5,opt,name=kind,proto3,enum=temporal.api.enums.v1.TaskQueueKind" json:"kind,omitempty"`
-	AckLevel    int64             `protobuf:"varint,6,opt,name=ack_level,json=ackLevel,proto3" json:"ack_level,omitempty"`
-	Expiry      *types.Timestamp  `protobuf:"bytes,7,opt,name=expiry,proto3" json:"expiry,omitempty"`
-	LastUpdated *types.Timestamp  `protobuf:"bytes,8,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"`
+	NamespaceId    string            `protobuf:"bytes,1,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	Name           string            `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	TaskType       v14.TaskQueueType `protobuf:"varint,3,opt,name=task_type,json=taskType,proto3,enum=temporal.api.enums.v1.TaskQueueType" json:"task_type,omitempty"`
+	Kind           v14.TaskQueueKind `protobuf:"varint,5,opt,name=kind,proto3,enum=temporal.api.enums.v1.TaskQueueKind" json:"kind,omitempty"`
+	AckLevel       int64             `protobuf:"varint,6,opt,name=ack_level,json=ackLevel,proto3" json:"ack_level,omitempty"`
+	ExpiryTime     *types.Timestamp  `protobuf:"bytes,7,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty"`
+	LastUpdateTime *types.Timestamp  `protobuf:"bytes,8,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
 }
 
 func (m *TaskQueueInfo) Reset()      { *m = TaskQueueInfo{} }
@@ -1429,16 +1437,16 @@ func (m *TaskQueueInfo) GetAckLevel() int64 {
 	return 0
 }
 
-func (m *TaskQueueInfo) GetExpiry() *types.Timestamp {
+func (m *TaskQueueInfo) GetExpiryTime() *types.Timestamp {
 	if m != nil {
-		return m.Expiry
+		return m.ExpiryTime
 	}
 	return nil
 }
 
-func (m *TaskQueueInfo) GetLastUpdated() *types.Timestamp {
+func (m *TaskQueueInfo) GetLastUpdateTime() *types.Timestamp {
 	if m != nil {
-		return m.LastUpdated
+		return m.LastUpdateTime
 	}
 	return nil
 }
@@ -1669,63 +1677,65 @@ func (m *WorkflowExecutionState) GetStatus() v14.WorkflowExecutionStatus {
 }
 
 type WorkflowExecutionInfo struct {
-	NamespaceId                             string                  `protobuf:"bytes,61,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
-	WorkflowId                              string                  `protobuf:"bytes,62,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"`
-	ParentNamespaceId                       string                  `protobuf:"bytes,1,opt,name=parent_namespace_id,json=parentNamespaceId,proto3" json:"parent_namespace_id,omitempty"`
-	ParentWorkflowId                        string                  `protobuf:"bytes,2,opt,name=parent_workflow_id,json=parentWorkflowId,proto3" json:"parent_workflow_id,omitempty"`
-	ParentRunId                             string                  `protobuf:"bytes,3,opt,name=parent_run_id,json=parentRunId,proto3" json:"parent_run_id,omitempty"`
-	InitiatedId                             int64                   `protobuf:"varint,4,opt,name=initiated_id,json=initiatedId,proto3" json:"initiated_id,omitempty"`
-	CompletionEventBatchId                  int64                   `protobuf:"varint,5,opt,name=completion_event_batch_id,json=completionEventBatchId,proto3" json:"completion_event_batch_id,omitempty"`
-	CompletionEvent                         []byte                  `protobuf:"bytes,6,opt,name=completion_event,json=completionEvent,proto3" json:"completion_event,omitempty"`
-	CompletionEventEncoding                 string                  `protobuf:"bytes,7,opt,name=completion_event_encoding,json=completionEventEncoding,proto3" json:"completion_event_encoding,omitempty"`
-	TaskQueue                               string                  `protobuf:"bytes,8,opt,name=task_queue,json=taskQueue,proto3" json:"task_queue,omitempty"`
-	WorkflowTypeName                        string                  `protobuf:"bytes,9,opt,name=workflow_type_name,json=workflowTypeName,proto3" json:"workflow_type_name,omitempty"`
-	WorkflowExecutionTimeoutSeconds         int32                   `protobuf:"varint,10,opt,name=workflow_execution_timeout_seconds,json=workflowExecutionTimeoutSeconds,proto3" json:"workflow_execution_timeout_seconds,omitempty"`
-	WorkflowRunTimeoutSeconds               int32                   `protobuf:"varint,11,opt,name=workflow_run_timeout_seconds,json=workflowRunTimeoutSeconds,proto3" json:"workflow_run_timeout_seconds,omitempty"`
-	WorkflowTaskTimeoutSeconds              int32                   `protobuf:"varint,12,opt,name=workflow_task_timeout_seconds,json=workflowTaskTimeoutSeconds,proto3" json:"workflow_task_timeout_seconds,omitempty"`
-	StartVersion                            int64                   `protobuf:"varint,15,opt,name=start_version,json=startVersion,proto3" json:"start_version,omitempty"`
-	CurrentVersion                          int64                   `protobuf:"varint,16,opt,name=current_version,json=currentVersion,proto3" json:"current_version,omitempty"`
-	ReplicationData                         *ReplicationData        `protobuf:"bytes,17,opt,name=replication_data,json=replicationData,proto3" json:"replication_data,omitempty"`
-	LastEventTaskId                         int64                   `protobuf:"varint,19,opt,name=last_event_task_id,json=lastEventTaskId,proto3" json:"last_event_task_id,omitempty"`
-	LastFirstEventId                        int64                   `protobuf:"varint,20,opt,name=last_first_event_id,json=lastFirstEventId,proto3" json:"last_first_event_id,omitempty"`
-	LastProcessedEvent                      int64                   `protobuf:"varint,21,opt,name=last_processed_event,json=lastProcessedEvent,proto3" json:"last_processed_event,omitempty"`
-	StartTimeNanos                          int64                   `protobuf:"varint,22,opt,name=start_time_nanos,json=startTimeNanos,proto3" json:"start_time_nanos,omitempty"`
-	LastUpdatedTimeNanos                    int64                   `protobuf:"varint,23,opt,name=last_updated_time_nanos,json=lastUpdatedTimeNanos,proto3" json:"last_updated_time_nanos,omitempty"`
-	DecisionVersion                         int64                   `protobuf:"varint,24,opt,name=decision_version,json=decisionVersion,proto3" json:"decision_version,omitempty"`
-	DecisionScheduleId                      int64                   `protobuf:"varint,25,opt,name=decision_schedule_id,json=decisionScheduleId,proto3" json:"decision_schedule_id,omitempty"`
-	DecisionStartedId                       int64                   `protobuf:"varint,26,opt,name=decision_started_id,json=decisionStartedId,proto3" json:"decision_started_id,omitempty"`
-	DecisionTimeout                         int32                   `protobuf:"varint,27,opt,name=decision_timeout,json=decisionTimeout,proto3" json:"decision_timeout,omitempty"`
-	DecisionAttempt                         int64                   `protobuf:"varint,28,opt,name=decision_attempt,json=decisionAttempt,proto3" json:"decision_attempt,omitempty"`
-	DecisionStartedTimestampNanos           int64                   `protobuf:"varint,29,opt,name=decision_started_timestamp_nanos,json=decisionStartedTimestampNanos,proto3" json:"decision_started_timestamp_nanos,omitempty"`
-	DecisionScheduledTimestampNanos         int64                   `protobuf:"varint,30,opt,name=decision_scheduled_timestamp_nanos,json=decisionScheduledTimestampNanos,proto3" json:"decision_scheduled_timestamp_nanos,omitempty"`
-	CancelRequested                         bool                    `protobuf:"varint,31,opt,name=cancel_requested,json=cancelRequested,proto3" json:"cancel_requested,omitempty"`
-	DecisionOriginalScheduledTimestampNanos int64                   `protobuf:"varint,32,opt,name=decision_original_scheduled_timestamp_nanos,json=decisionOriginalScheduledTimestampNanos,proto3" json:"decision_original_scheduled_timestamp_nanos,omitempty"`
-	DecisionRequestId                       string                  `protobuf:"bytes,34,opt,name=decision_request_id,json=decisionRequestId,proto3" json:"decision_request_id,omitempty"`
-	CancelRequestId                         string                  `protobuf:"bytes,35,opt,name=cancel_request_id,json=cancelRequestId,proto3" json:"cancel_request_id,omitempty"`
-	StickyTaskQueue                         string                  `protobuf:"bytes,36,opt,name=sticky_task_queue,json=stickyTaskQueue,proto3" json:"sticky_task_queue,omitempty"`
-	StickyScheduleToStartTimeout            int64                   `protobuf:"varint,37,opt,name=sticky_schedule_to_start_timeout,json=stickyScheduleToStartTimeout,proto3" json:"sticky_schedule_to_start_timeout,omitempty"`
-	RetryAttempt                            int64                   `protobuf:"varint,38,opt,name=retry_attempt,json=retryAttempt,proto3" json:"retry_attempt,omitempty"`
-	RetryInitialIntervalSeconds             int32                   `protobuf:"varint,39,opt,name=retry_initial_interval_seconds,json=retryInitialIntervalSeconds,proto3" json:"retry_initial_interval_seconds,omitempty"`
-	RetryMaximumIntervalSeconds             int32                   `protobuf:"varint,40,opt,name=retry_maximum_interval_seconds,json=retryMaximumIntervalSeconds,proto3" json:"retry_maximum_interval_seconds,omitempty"`
-	RetryMaximumAttempts                    int32                   `protobuf:"varint,41,opt,name=retry_maximum_attempts,json=retryMaximumAttempts,proto3" json:"retry_maximum_attempts,omitempty"`
-	RetryBackoffCoefficient                 float64                 `protobuf:"fixed64,42,opt,name=retry_backoff_coefficient,json=retryBackoffCoefficient,proto3" json:"retry_backoff_coefficient,omitempty"`
-	RetryExpirationTimeNanos                int64                   `protobuf:"varint,43,opt,name=retry_expiration_time_nanos,json=retryExpirationTimeNanos,proto3" json:"retry_expiration_time_nanos,omitempty"`
-	RetryNonRetryableErrorTypes             []string                `protobuf:"bytes,44,rep,name=retry_non_retryable_error_types,json=retryNonRetryableErrorTypes,proto3" json:"retry_non_retryable_error_types,omitempty"`
-	HasRetryPolicy                          bool                    `protobuf:"varint,45,opt,name=has_retry_policy,json=hasRetryPolicy,proto3" json:"has_retry_policy,omitempty"`
-	CronSchedule                            string                  `protobuf:"bytes,46,opt,name=cron_schedule,json=cronSchedule,proto3" json:"cron_schedule,omitempty"`
-	EventStoreVersion                       int32                   `protobuf:"varint,47,opt,name=event_store_version,json=eventStoreVersion,proto3" json:"event_store_version,omitempty"`
-	EventBranchToken                        []byte                  `protobuf:"bytes,48,opt,name=event_branch_token,json=eventBranchToken,proto3" json:"event_branch_token,omitempty"`
-	SignalCount                             int64                   `protobuf:"varint,49,opt,name=signal_count,json=signalCount,proto3" json:"signal_count,omitempty"`
-	HistorySize                             int64                   `protobuf:"varint,50,opt,name=history_size,json=historySize,proto3" json:"history_size,omitempty"`
-	ClientLibraryVersion                    string                  `protobuf:"bytes,51,opt,name=client_library_version,json=clientLibraryVersion,proto3" json:"client_library_version,omitempty"`
-	ClientFeatureVersion                    string                  `protobuf:"bytes,52,opt,name=client_feature_version,json=clientFeatureVersion,proto3" json:"client_feature_version,omitempty"`
-	ClientImpl                              string                  `protobuf:"bytes,53,opt,name=client_impl,json=clientImpl,proto3" json:"client_impl,omitempty"`
-	AutoResetPoints                         []byte                  `protobuf:"bytes,54,opt,name=auto_reset_points,json=autoResetPoints,proto3" json:"auto_reset_points,omitempty"`
-	AutoResetPointsEncoding                 string                  `protobuf:"bytes,55,opt,name=auto_reset_points_encoding,json=autoResetPointsEncoding,proto3" json:"auto_reset_points_encoding,omitempty"`
-	SearchAttributes                        map[string]*v11.Payload `protobuf:"bytes,56,rep,name=search_attributes,json=searchAttributes,proto3" json:"search_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Memo                                    map[string]*v11.Payload `protobuf:"bytes,57,rep,name=memo,proto3" json:"memo,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	VersionHistories                        []byte                  `protobuf:"bytes,58,opt,name=version_histories,json=versionHistories,proto3" json:"version_histories,omitempty"`
-	VersionHistoriesEncoding                string                  `protobuf:"bytes,59,opt,name=version_histories_encoding,json=versionHistoriesEncoding,proto3" json:"version_histories_encoding,omitempty"`
+	NamespaceId                             string           `protobuf:"bytes,61,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"`
+	WorkflowId                              string           `protobuf:"bytes,62,opt,name=workflow_id,json=workflowId,proto3" json:"workflow_id,omitempty"`
+	ParentNamespaceId                       string           `protobuf:"bytes,1,opt,name=parent_namespace_id,json=parentNamespaceId,proto3" json:"parent_namespace_id,omitempty"`
+	ParentWorkflowId                        string           `protobuf:"bytes,2,opt,name=parent_workflow_id,json=parentWorkflowId,proto3" json:"parent_workflow_id,omitempty"`
+	ParentRunId                             string           `protobuf:"bytes,3,opt,name=parent_run_id,json=parentRunId,proto3" json:"parent_run_id,omitempty"`
+	InitiatedId                             int64            `protobuf:"varint,4,opt,name=initiated_id,json=initiatedId,proto3" json:"initiated_id,omitempty"`
+	CompletionEventBatchId                  int64            `protobuf:"varint,5,opt,name=completion_event_batch_id,json=completionEventBatchId,proto3" json:"completion_event_batch_id,omitempty"`
+	CompletionEvent                         []byte           `protobuf:"bytes,6,opt,name=completion_event,json=completionEvent,proto3" json:"completion_event,omitempty"`
+	CompletionEventEncoding                 string           `protobuf:"bytes,7,opt,name=completion_event_encoding,json=completionEventEncoding,proto3" json:"completion_event_encoding,omitempty"`
+	TaskQueue                               string           `protobuf:"bytes,8,opt,name=task_queue,json=taskQueue,proto3" json:"task_queue,omitempty"`
+	WorkflowTypeName                        string           `protobuf:"bytes,9,opt,name=workflow_type_name,json=workflowTypeName,proto3" json:"workflow_type_name,omitempty"`
+	WorkflowExecutionTimeoutSeconds         int32            `protobuf:"varint,10,opt,name=workflow_execution_timeout_seconds,json=workflowExecutionTimeoutSeconds,proto3" json:"workflow_execution_timeout_seconds,omitempty"`
+	WorkflowRunTimeoutSeconds               int32            `protobuf:"varint,11,opt,name=workflow_run_timeout_seconds,json=workflowRunTimeoutSeconds,proto3" json:"workflow_run_timeout_seconds,omitempty"`
+	WorkflowTaskTimeoutSeconds              int32            `protobuf:"varint,12,opt,name=workflow_task_timeout_seconds,json=workflowTaskTimeoutSeconds,proto3" json:"workflow_task_timeout_seconds,omitempty"`
+	StartVersion                            int64            `protobuf:"varint,15,opt,name=start_version,json=startVersion,proto3" json:"start_version,omitempty"`
+	CurrentVersion                          int64            `protobuf:"varint,16,opt,name=current_version,json=currentVersion,proto3" json:"current_version,omitempty"`
+	ReplicationData                         *ReplicationData `protobuf:"bytes,17,opt,name=replication_data,json=replicationData,proto3" json:"replication_data,omitempty"`
+	LastEventTaskId                         int64            `protobuf:"varint,19,opt,name=last_event_task_id,json=lastEventTaskId,proto3" json:"last_event_task_id,omitempty"`
+	LastFirstEventId                        int64            `protobuf:"varint,20,opt,name=last_first_event_id,json=lastFirstEventId,proto3" json:"last_first_event_id,omitempty"`
+	LastProcessedEvent                      int64            `protobuf:"varint,21,opt,name=last_processed_event,json=lastProcessedEvent,proto3" json:"last_processed_event,omitempty"`
+	StartTimeNanos                          int64            `protobuf:"varint,22,opt,name=start_time_nanos,json=startTimeNanos,proto3" json:"start_time_nanos,omitempty"`
+	LastUpdateTimeNanos                     int64            `protobuf:"varint,23,opt,name=last_update_time_nanos,json=lastUpdateTimeNanos,proto3" json:"last_update_time_nanos,omitempty"`
+	DecisionVersion                         int64            `protobuf:"varint,24,opt,name=decision_version,json=decisionVersion,proto3" json:"decision_version,omitempty"`
+	DecisionScheduleId                      int64            `protobuf:"varint,25,opt,name=decision_schedule_id,json=decisionScheduleId,proto3" json:"decision_schedule_id,omitempty"`
+	DecisionStartedId                       int64            `protobuf:"varint,26,opt,name=decision_started_id,json=decisionStartedId,proto3" json:"decision_started_id,omitempty"`
+	DecisionTimeout                         int32            `protobuf:"varint,27,opt,name=decision_timeout,json=decisionTimeout,proto3" json:"decision_timeout,omitempty"`
+	DecisionAttempt                         int64            `protobuf:"varint,28,opt,name=decision_attempt,json=decisionAttempt,proto3" json:"decision_attempt,omitempty"`
+	DecisionStartedTimestampNanos           int64            `protobuf:"varint,29,opt,name=decision_started_timestamp_nanos,json=decisionStartedTimestampNanos,proto3" json:"decision_started_timestamp_nanos,omitempty"`
+	DecisionScheduledTimestampNanos         int64            `protobuf:"varint,30,opt,name=decision_scheduled_timestamp_nanos,json=decisionScheduledTimestampNanos,proto3" json:"decision_scheduled_timestamp_nanos,omitempty"`
+	CancelRequested                         bool             `protobuf:"varint,31,opt,name=cancel_requested,json=cancelRequested,proto3" json:"cancel_requested,omitempty"`
+	DecisionOriginalScheduledTimestampNanos int64            `protobuf:"varint,32,opt,name=decision_original_scheduled_timestamp_nanos,json=decisionOriginalScheduledTimestampNanos,proto3" json:"decision_original_scheduled_timestamp_nanos,omitempty"`
+	DecisionRequestId                       string           `protobuf:"bytes,34,opt,name=decision_request_id,json=decisionRequestId,proto3" json:"decision_request_id,omitempty"`
+	CancelRequestId                         string           `protobuf:"bytes,35,opt,name=cancel_request_id,json=cancelRequestId,proto3" json:"cancel_request_id,omitempty"`
+	StickyTaskQueue                         string           `protobuf:"bytes,36,opt,name=sticky_task_queue,json=stickyTaskQueue,proto3" json:"sticky_task_queue,omitempty"`
+	// (-- api-linter: core::0140::prepositions=disabled
+	//     aip.dev/not-precedent: "to" is used to indicate interval. --)
+	StickyScheduleToStartTimeout int64                   `protobuf:"varint,37,opt,name=sticky_schedule_to_start_timeout,json=stickyScheduleToStartTimeout,proto3" json:"sticky_schedule_to_start_timeout,omitempty"`
+	RetryAttempt                 int64                   `protobuf:"varint,38,opt,name=retry_attempt,json=retryAttempt,proto3" json:"retry_attempt,omitempty"`
+	RetryInitialIntervalSeconds  int32                   `protobuf:"varint,39,opt,name=retry_initial_interval_seconds,json=retryInitialIntervalSeconds,proto3" json:"retry_initial_interval_seconds,omitempty"`
+	RetryMaximumIntervalSeconds  int32                   `protobuf:"varint,40,opt,name=retry_maximum_interval_seconds,json=retryMaximumIntervalSeconds,proto3" json:"retry_maximum_interval_seconds,omitempty"`
+	RetryMaximumAttempts         int32                   `protobuf:"varint,41,opt,name=retry_maximum_attempts,json=retryMaximumAttempts,proto3" json:"retry_maximum_attempts,omitempty"`
+	RetryBackoffCoefficient      float64                 `protobuf:"fixed64,42,opt,name=retry_backoff_coefficient,json=retryBackoffCoefficient,proto3" json:"retry_backoff_coefficient,omitempty"`
+	RetryExpirationTimeNanos     int64                   `protobuf:"varint,43,opt,name=retry_expiration_time_nanos,json=retryExpirationTimeNanos,proto3" json:"retry_expiration_time_nanos,omitempty"`
+	RetryNonRetryableErrorTypes  []string                `protobuf:"bytes,44,rep,name=retry_non_retryable_error_types,json=retryNonRetryableErrorTypes,proto3" json:"retry_non_retryable_error_types,omitempty"`
+	HasRetryPolicy               bool                    `protobuf:"varint,45,opt,name=has_retry_policy,json=hasRetryPolicy,proto3" json:"has_retry_policy,omitempty"`
+	CronSchedule                 string                  `protobuf:"bytes,46,opt,name=cron_schedule,json=cronSchedule,proto3" json:"cron_schedule,omitempty"`
+	EventStoreVersion            int32                   `protobuf:"varint,47,opt,name=event_store_version,json=eventStoreVersion,proto3" json:"event_store_version,omitempty"`
+	EventBranchToken             []byte                  `protobuf:"bytes,48,opt,name=event_branch_token,json=eventBranchToken,proto3" json:"event_branch_token,omitempty"`
+	SignalCount                  int64                   `protobuf:"varint,49,opt,name=signal_count,json=signalCount,proto3" json:"signal_count,omitempty"`
+	HistorySize                  int64                   `protobuf:"varint,50,opt,name=history_size,json=historySize,proto3" json:"history_size,omitempty"`
+	ClientLibraryVersion         string                  `protobuf:"bytes,51,opt,name=client_library_version,json=clientLibraryVersion,proto3" json:"client_library_version,omitempty"`
+	ClientFeatureVersion         string                  `protobuf:"bytes,52,opt,name=client_feature_version,json=clientFeatureVersion,proto3" json:"client_feature_version,omitempty"`
+	ClientImpl                   string                  `protobuf:"bytes,53,opt,name=client_impl,json=clientImpl,proto3" json:"client_impl,omitempty"`
+	AutoResetPoints              []byte                  `protobuf:"bytes,54,opt,name=auto_reset_points,json=autoResetPoints,proto3" json:"auto_reset_points,omitempty"`
+	AutoResetPointsEncoding      string                  `protobuf:"bytes,55,opt,name=auto_reset_points_encoding,json=autoResetPointsEncoding,proto3" json:"auto_reset_points_encoding,omitempty"`
+	SearchAttributes             map[string]*v11.Payload `protobuf:"bytes,56,rep,name=search_attributes,json=searchAttributes,proto3" json:"search_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Memo                         map[string]*v11.Payload `protobuf:"bytes,57,rep,name=memo,proto3" json:"memo,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	VersionHistories             []byte                  `protobuf:"bytes,58,opt,name=version_histories,json=versionHistories,proto3" json:"version_histories,omitempty"`
+	VersionHistoriesEncoding     string                  `protobuf:"bytes,59,opt,name=version_histories_encoding,json=versionHistoriesEncoding,proto3" json:"version_histories_encoding,omitempty"`
 }
 
 func (m *WorkflowExecutionInfo) Reset()      { *m = WorkflowExecutionInfo{} }
@@ -1907,9 +1917,9 @@ func (m *WorkflowExecutionInfo) GetStartTimeNanos() int64 {
 	return 0
 }
 
-func (m *WorkflowExecutionInfo) GetLastUpdatedTimeNanos() int64 {
+func (m *WorkflowExecutionInfo) GetLastUpdateTimeNanos() int64 {
 	if m != nil {
-		return m.LastUpdatedTimeNanos
+		return m.LastUpdateTimeNanos
 	}
 	return 0
 }
@@ -2457,12 +2467,12 @@ func (m *NamespaceDetail) GetFailoverEndTime() int64 {
 }
 
 type NamespaceInfo struct {
-	Id          string              `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Status      v14.NamespaceStatus `protobuf:"varint,2,opt,name=status,proto3,enum=temporal.api.enums.v1.NamespaceStatus" json:"status,omitempty"`
-	Name        string              `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	Description string              `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
-	Owner       string              `protobuf:"bytes,5,opt,name=owner,proto3" json:"owner,omitempty"`
-	Data        map[string]string   `protobuf:"bytes,6,rep,name=data,proto3" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Id          string             `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	State       v14.NamespaceState `protobuf:"varint,2,opt,name=state,proto3,enum=temporal.api.enums.v1.NamespaceState" json:"state,omitempty"`
+	Name        string             `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Description string             `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+	Owner       string             `protobuf:"bytes,5,opt,name=owner,proto3" json:"owner,omitempty"`
+	Data        map[string]string  `protobuf:"bytes,6,rep,name=data,proto3" json:"data,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (m *NamespaceInfo) Reset()      { *m = NamespaceInfo{} }
@@ -2504,11 +2514,11 @@ func (m *NamespaceInfo) GetId() string {
 	return ""
 }
 
-func (m *NamespaceInfo) GetStatus() v14.NamespaceStatus {
+func (m *NamespaceInfo) GetState() v14.NamespaceState {
 	if m != nil {
-		return m.Status
+		return m.State
 	}
-	return v14.NAMESPACE_STATUS_UNSPECIFIED
+	return v14.NAMESPACE_STATE_UNSPECIFIED
 }
 
 func (m *NamespaceInfo) GetName() string {
@@ -2591,14 +2601,14 @@ func (m *NamespaceReplicationConfig) GetClusters() []string {
 }
 
 type NamespaceConfig struct {
-	RetentionDays            int32              `protobuf:"varint,1,opt,name=retention_days,json=retentionDays,proto3" json:"retention_days,omitempty"`
-	EmitMetric               bool               `protobuf:"varint,2,opt,name=emit_metric,json=emitMetric,proto3" json:"emit_metric,omitempty"`
-	ArchivalBucket           string             `protobuf:"bytes,3,opt,name=archival_bucket,json=archivalBucket,proto3" json:"archival_bucket,omitempty"`
-	BadBinaries              *v15.BadBinaries   `protobuf:"bytes,16,opt,name=bad_binaries,json=badBinaries,proto3" json:"bad_binaries,omitempty"`
-	HistoryArchivalStatus    v14.ArchivalStatus `protobuf:"varint,18,opt,name=history_archival_status,json=historyArchivalStatus,proto3,enum=temporal.api.enums.v1.ArchivalStatus" json:"history_archival_status,omitempty"`
-	HistoryArchivalUri       string             `protobuf:"bytes,19,opt,name=history_archival_uri,json=historyArchivalUri,proto3" json:"history_archival_uri,omitempty"`
-	VisibilityArchivalStatus v14.ArchivalStatus `protobuf:"varint,20,opt,name=visibility_archival_status,json=visibilityArchivalStatus,proto3,enum=temporal.api.enums.v1.ArchivalStatus" json:"visibility_archival_status,omitempty"`
-	VisibilityArchivalUri    string             `protobuf:"bytes,21,opt,name=visibility_archival_uri,json=visibilityArchivalUri,proto3" json:"visibility_archival_uri,omitempty"`
+	RetentionDays           int32             `protobuf:"varint,1,opt,name=retention_days,json=retentionDays,proto3" json:"retention_days,omitempty"`
+	EmitMetric              bool              `protobuf:"varint,2,opt,name=emit_metric,json=emitMetric,proto3" json:"emit_metric,omitempty"`
+	ArchivalBucket          string            `protobuf:"bytes,3,opt,name=archival_bucket,json=archivalBucket,proto3" json:"archival_bucket,omitempty"`
+	BadBinaries             *v15.BadBinaries  `protobuf:"bytes,16,opt,name=bad_binaries,json=badBinaries,proto3" json:"bad_binaries,omitempty"`
+	HistoryArchivalState    v14.ArchivalState `protobuf:"varint,18,opt,name=history_archival_state,json=historyArchivalState,proto3,enum=temporal.api.enums.v1.ArchivalState" json:"history_archival_state,omitempty"`
+	HistoryArchivalUri      string            `protobuf:"bytes,19,opt,name=history_archival_uri,json=historyArchivalUri,proto3" json:"history_archival_uri,omitempty"`
+	VisibilityArchivalState v14.ArchivalState `protobuf:"varint,20,opt,name=visibility_archival_state,json=visibilityArchivalState,proto3,enum=temporal.api.enums.v1.ArchivalState" json:"visibility_archival_state,omitempty"`
+	VisibilityArchivalUri   string            `protobuf:"bytes,21,opt,name=visibility_archival_uri,json=visibilityArchivalUri,proto3" json:"visibility_archival_uri,omitempty"`
 }
 
 func (m *NamespaceConfig) Reset()      { *m = NamespaceConfig{} }
@@ -2661,11 +2671,11 @@ func (m *NamespaceConfig) GetBadBinaries() *v15.BadBinaries {
 	return nil
 }
 
-func (m *NamespaceConfig) GetHistoryArchivalStatus() v14.ArchivalStatus {
+func (m *NamespaceConfig) GetHistoryArchivalState() v14.ArchivalState {
 	if m != nil {
-		return m.HistoryArchivalStatus
+		return m.HistoryArchivalState
 	}
-	return v14.ARCHIVAL_STATUS_UNSPECIFIED
+	return v14.ARCHIVAL_STATE_UNSPECIFIED
 }
 
 func (m *NamespaceConfig) GetHistoryArchivalUri() string {
@@ -2675,11 +2685,11 @@ func (m *NamespaceConfig) GetHistoryArchivalUri() string {
 	return ""
 }
 
-func (m *NamespaceConfig) GetVisibilityArchivalStatus() v14.ArchivalStatus {
+func (m *NamespaceConfig) GetVisibilityArchivalState() v14.ArchivalState {
 	if m != nil {
-		return m.VisibilityArchivalStatus
+		return m.VisibilityArchivalState
 	}
-	return v14.ARCHIVAL_STATUS_UNSPECIFIED
+	return v14.ARCHIVAL_STATE_UNSPECIFIED
 }
 
 func (m *NamespaceConfig) GetVisibilityArchivalUri() string {
@@ -2836,266 +2846,266 @@ func init() {
 }
 
 var fileDescriptor_ef806e155800e59a = []byte{
-	// 4142 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3b, 0x4b, 0x6f, 0x1c, 0x47,
-	0x7a, 0x1a, 0xbe, 0xe7, 0x9b, 0x21, 0x39, 0x53, 0x7c, 0x35, 0x47, 0xd2, 0x90, 0x1a, 0x4b, 0x16,
-	0x65, 0x69, 0x47, 0x12, 0x2d, 0xcb, 0xb2, 0xb4, 0x76, 0x96, 0xa4, 0xa8, 0x68, 0x6c, 0x4b, 0xd6,
-	0x36, 0x69, 0x6b, 0x37, 0xd8, 0xa0, 0xd1, 0xec, 0x2e, 0x92, 0x0d, 0xf6, 0x74, 0x8f, 0xbb, 0x7b,
-	0x48, 0x73, 0x73, 0xd9, 0x20, 0x08, 0x92, 0x20, 0x01, 0x92, 0x9f, 0x10, 0x24, 0x08, 0x90, 0x3f,
-	0x10, 0x04, 0x08, 0x90, 0x63, 0x90, 0x1c, 0x0d, 0xe4, 0xb2, 0xc7, 0xb5, 0x8c, 0x00, 0xb9, 0x65,
-	0xaf, 0x41, 0x2e, 0x41, 0x7d, 0xf5, 0xe8, 0xea, 0x9e, 0xe6, 0x43, 0xf2, 0x6e, 0x02, 0xdf, 0x38,
-	0xdf, 0xab, 0xbe, 0xae, 0xfa, 0xea, 0x7b, 0x16, 0xe1, 0xbd, 0x84, 0x76, 0x7b, 0x61, 0x64, 0xfb,
-	0xb7, 0x63, 0x1a, 0x1d, 0xd2, 0xe8, 0xb6, 0xdd, 0xf3, 0x6e, 0xf7, 0x68, 0x14, 0x7b, 0x71, 0x42,
-	0x03, 0x87, 0xee, 0xf8, 0xe1, 0x4e, 0x7c, 0xfb, 0xf0, 0xee, 0xed, 0x2e, 0x8d, 0x63, 0x7b, 0x8f,
-	0xb6, 0x7b, 0x51, 0x98, 0x84, 0xe4, 0xba, 0x64, 0x6b, 0x73, 0xb6, 0xb6, 0xdd, 0xf3, 0xda, 0x79,
-	0xb6, 0xf6, 0xe1, 0xdd, 0xc6, 0xd2, 0x5e, 0x18, 0xee, 0xf9, 0xf4, 0x36, 0xb2, 0xed, 0xf4, 0x77,
-	0x6f, 0x27, 0x5e, 0x97, 0xc6, 0x89, 0xdd, 0xed, 0x71, 0x49, 0x8d, 0x66, 0x9e, 0xe0, 0x28, 0xb2,
-	0x7b, 0x4c, 0x92, 0xc0, 0x5f, 0x55, 0x0a, 0x32, 0xcd, 0x9c, 0xb0, 0xdb, 0x0d, 0x83, 0x01, 0x7d,
-	0x72, 0x54, 0x34, 0xe8, 0x77, 0x51, 0xe9, 0xa3, 0x30, 0x3a, 0xd8, 0xf5, 0xc3, 0x23, 0x41, 0x75,
-	0xad, 0x98, 0x2a, 0xb0, 0xbb, 0x34, 0xee, 0xd9, 0x8e, 0x14, 0x76, 0x3d, 0x43, 0xa6, 0xb0, 0x83,
-	0xab, 0xbe, 0x5d, 0x2c, 0x2f, 0xb1, 0xe3, 0x03, 0xeb, 0xcb, 0x3e, 0xed, 0xd3, 0xc2, 0x75, 0x77,
-	0x6d, 0xcf, 0xef, 0x47, 0x05, 0xe2, 0x6e, 0x14, 0x9d, 0x85, 0x92, 0xca, 0x3f, 0x5d, 0x90, 0xde,
-	0x3c, 0x95, 0x34, 0xf7, 0xd9, 0xd7, 0x4f, 0x25, 0x66, 0xda, 0x0a, 0xc2, 0x3b, 0x45, 0x84, 0x11,
-	0xed, 0xf9, 0x9e, 0x63, 0x27, 0x5e, 0xc1, 0xbe, 0xb7, 0xba, 0x60, 0x74, 0xba, 0xdd, 0x7e, 0x62,
-	0xef, 0xf8, 0x74, 0xc3, 0xef, 0xc7, 0x09, 0x8d, 0x9e, 0xd1, 0xc4, 0x76, 0xed, 0xc4, 0x26, 0x57,
-	0xa0, 0xea, 0x70, 0x90, 0xc5, 0xf6, 0xd0, 0x28, 0x2d, 0x97, 0x56, 0xca, 0x66, 0x45, 0xc0, 0x9e,
-	0xdb, 0x5d, 0x4a, 0xda, 0x30, 0xb3, 0xef, 0xc5, 0x49, 0x18, 0x1d, 0x5b, 0xf1, 0xbe, 0x1d, 0xb9,
-	0x96, 0x13, 0xf6, 0x83, 0xc4, 0x18, 0x5a, 0x2e, 0xad, 0x8c, 0x9a, 0x75, 0x81, 0xda, 0x62, 0x98,
-	0x0d, 0x86, 0x68, 0xfd, 0xe9, 0x14, 0x54, 0xd7, 0x9c, 0xc4, 0x3b, 0xf4, 0x92, 0xe3, 0x4e, 0xb0,
-	0x1b, 0x12, 0x03, 0xc6, 0x0f, 0x99, 0xd5, 0x85, 0x01, 0x8a, 0x1f, 0x36, 0xe5, 0x4f, 0xf2, 0x3e,
-	0x18, 0xb1, 0xb3, 0x4f, 0xdd, 0xbe, 0x4f, 0x5d, 0x8b, 0x1e, 0xd2, 0x20, 0xb1, 0x76, 0xec, 0xc4,
-	0xd9, 0xb7, 0x3c, 0x17, 0xe5, 0x0f, 0x9b, 0x73, 0x0a, 0xbf, 0xc9, 0xd0, 0xeb, 0x0c, 0xdb, 0x71,
-	0xc9, 0x75, 0x98, 0xce, 0x31, 0x1a, 0xc3, 0xcb, 0xa5, 0x95, 0xaa, 0x39, 0x95, 0xa5, 0x27, 0x0f,
-	0x06, 0x57, 0xa0, 0x81, 0x13, 0xba, 0x5e, 0xb0, 0x67, 0x8c, 0xe0, 0xb7, 0xce, 0x67, 0x39, 0x36,
-	0x05, 0x96, 0xdc, 0x81, 0xd9, 0x94, 0x93, 0x5d, 0x08, 0x2b, 0xb0, 0x83, 0x30, 0x36, 0x46, 0x51,
-	0x2f, 0xa2, 0x70, 0xdb, 0x5e, 0x97, 0x3e, 0x67, 0x18, 0x72, 0x19, 0x20, 0x4e, 0xec, 0x28, 0xa1,
-	0x2e, 0xd3, 0x7f, 0x0c, 0xe9, 0xca, 0x02, 0xd2, 0x71, 0xc9, 0x5b, 0x30, 0x29, 0xd1, 0x5c, 0xe3,
-	0x71, 0xd4, 0xb8, 0x2a, 0x80, 0x5c, 0xdf, 0x7b, 0x30, 0x9f, 0x21, 0x4a, 0xb5, 0x9d, 0x40, 0x6d,
-	0x67, 0x75, 0x6a, 0xa5, 0xeb, 0x2d, 0x20, 0x92, 0x4b, 0xd3, 0xb4, 0x8c, 0x1a, 0xd4, 0x04, 0x26,
-	0xd5, 0x73, 0x09, 0x2a, 0xb6, 0x38, 0x1f, 0xa6, 0x28, 0xa0, 0x60, 0x90, 0xa0, 0x8e, 0xcb, 0x3e,
-	0x24, 0xa2, 0x5f, 0xf6, 0x69, 0x9c, 0x30, 0x7c, 0x05, 0xf1, 0x65, 0x01, 0xe9, 0xb8, 0xe4, 0x29,
-	0x5c, 0x91, 0x5f, 0x6f, 0x25, 0xa1, 0x85, 0xf2, 0x71, 0xdd, 0xb0, 0x9f, 0x58, 0x31, 0x75, 0xc2,
-	0xc0, 0x8d, 0x8d, 0x2a, 0x9a, 0xc7, 0x65, 0x49, 0xb8, 0x1d, 0x6e, 0x31, 0xb2, 0x6d, 0x4e, 0xb5,
-	0xc5, 0x89, 0xf2, 0x92, 0x1c, 0x3f, 0x8c, 0xe9, 0x80, 0xa4, 0xc9, 0xbc, 0xa4, 0x0d, 0x46, 0x96,
-	0x93, 0xb4, 0x0e, 0x4d, 0xa1, 0xc7, 0x49, 0x62, 0xa6, 0x50, 0x4c, 0x03, 0xa9, 0x8a, 0x65, 0x3c,
-	0x84, 0xc5, 0x7d, 0x6a, 0x47, 0xc9, 0x0e, 0xb5, 0x07, 0xbf, 0x67, 0x1a, 0xd9, 0x17, 0x14, 0x41,
-	0x8e, 0xf7, 0x06, 0xd4, 0x1c, 0x3b, 0x70, 0xa8, 0x6f, 0x89, 0x7d, 0xa2, 0xae, 0x51, 0x5b, 0x2e,
-	0xad, 0x4c, 0x98, 0xd3, 0x1c, 0x6e, 0x4a, 0x30, 0x79, 0x07, 0xea, 0x59, 0x52, 0xb6, 0xc9, 0x75,
-	0x3c, 0xab, 0x2c, 0x6d, 0x07, 0x69, 0x99, 0x22, 0x91, 0x85, 0xee, 0x2a, 0x4e, 0xec, 0xa4, 0x1f,
-	0x1b, 0x04, 0x55, 0x99, 0x46, 0xc4, 0xb6, 0x1d, 0x1f, 0x6c, 0x21, 0x98, 0x5d, 0x33, 0x3b, 0x61,
-	0xce, 0x21, 0x31, 0x66, 0x90, 0x42, 0xfe, 0x64, 0xe7, 0x99, 0xba, 0x3b, 0x63, 0x96, 0x9f, 0x27,
-	0x83, 0xfc, 0x98, 0x01, 0x98, 0xee, 0xa9, 0xdd, 0xd2, 0x20, 0xf1, 0x92, 0x63, 0x63, 0x0e, 0x89,
-	0xa6, 0x95, 0xf5, 0x72, 0x30, 0x59, 0x81, 0xda, 0xbe, 0x1d, 0x5b, 0x11, 0x4d, 0xa2, 0x63, 0xab,
-	0x17, 0xfa, 0x9e, 0x73, 0x6c, 0xcc, 0xe3, 0x67, 0x4e, 0xed, 0xdb, 0xb1, 0xc9, 0xc0, 0x2f, 0x10,
-	0x4a, 0x36, 0xa0, 0xc9, 0xa9, 0xbc, 0xc0, 0x4b, 0x3c, 0xdb, 0xb7, 0xbc, 0x20, 0xa1, 0xd1, 0xa1,
-	0xed, 0xab, 0x1d, 0x5d, 0x40, 0x25, 0x2f, 0x22, 0x55, 0x87, 0x13, 0x75, 0x04, 0x8d, 0xdc, 0x55,
-	0x25, 0xa4, 0x6b, 0x7f, 0xe5, 0x75, 0xfb, 0xdd, 0x41, 0x21, 0x86, 0x26, 0xe4, 0x19, 0x27, 0xca,
-	0x0b, 0xb9, 0x07, 0xf3, 0x59, 0x21, 0x62, 0x5b, 0x62, 0x63, 0x11, 0x99, 0x67, 0x75, 0xe6, 0x35,
-	0x81, 0x23, 0x1f, 0x02, 0x17, 0x6a, 0xd1, 0xaf, 0x7a, 0x5e, 0x84, 0x9e, 0x55, 0xbf, 0x5b, 0x0d,
-	0x3c, 0x2f, 0x03, 0x49, 0x36, 0x15, 0x45, 0x7a, 0xc7, 0x1e, 0xc2, 0x22, 0x67, 0xdf, 0xb1, 0x9d,
-	0x83, 0x70, 0x77, 0xd7, 0x72, 0x42, 0xba, 0xbb, 0xeb, 0x39, 0x1e, 0xbb, 0xf8, 0x17, 0x97, 0x4b,
-	0x2b, 0x25, 0x73, 0x01, 0x09, 0xd6, 0x39, 0x7e, 0x23, 0x45, 0x93, 0xc7, 0xb0, 0xc4, 0x79, 0x83,
-	0x30, 0xe0, 0x5b, 0xcd, 0x3c, 0xb7, 0x45, 0xa3, 0x28, 0x8c, 0xac, 0xe4, 0xb8, 0x47, 0x63, 0xe3,
-	0xd2, 0xf2, 0xf0, 0x4a, 0x59, 0x7c, 0xf6, 0xf3, 0x30, 0x30, 0x25, 0xd1, 0x26, 0xa3, 0xd9, 0x66,
-	0x24, 0xe4, 0x39, 0x10, 0x2e, 0xc5, 0xb7, 0xe3, 0xc4, 0x12, 0xf1, 0xcc, 0xb8, 0xbc, 0x5c, 0x5a,
-	0xa9, 0xac, 0x2e, 0xb7, 0x55, 0x6a, 0xc0, 0x72, 0x02, 0x81, 0x6c, 0x1f, 0xde, 0x6d, 0x3f, 0xe1,
-	0x7f, 0x9a, 0x35, 0xe4, 0xfd, 0xd4, 0x8e, 0x13, 0x01, 0x21, 0x8f, 0xa0, 0xa1, 0xc9, 0x63, 0xd1,
-	0x8b, 0x46, 0xa9, 0xbd, 0x34, 0xd1, 0x5e, 0x16, 0x14, 0xd7, 0x4b, 0xc4, 0x2b, 0xbb, 0xb9, 0x02,
-	0x55, 0x15, 0xa2, 0x99, 0xb9, 0x2f, 0xf1, 0x30, 0xa3, 0x60, 0x1d, 0x97, 0x79, 0x25, 0xe5, 0x0b,
-	0x3c, 0xd7, 0x58, 0xc6, 0x0d, 0x06, 0x09, 0xea, 0xb8, 0xe4, 0x0b, 0x98, 0xc7, 0xa5, 0xd3, 0x3b,
-	0xea, 0xd2, 0xc4, 0xf6, 0xfc, 0xd8, 0xb8, 0x52, 0xf4, 0x51, 0x22, 0x14, 0x1f, 0xde, 0x6d, 0xbf,
-	0xb0, 0x8f, 0xfd, 0xd0, 0x76, 0x63, 0x73, 0x96, 0xf1, 0x3f, 0x95, 0xec, 0x8f, 0x39, 0x37, 0xf9,
-	0x29, 0x5c, 0xcc, 0xc9, 0xed, 0xf7, 0x5c, 0x5b, 0xfa, 0x52, 0xa3, 0x85, 0xc2, 0x1b, 0x6d, 0x9e,
-	0x02, 0xb5, 0x65, 0x0a, 0xd4, 0xde, 0x96, 0x39, 0x92, 0x69, 0x64, 0xc4, 0x7e, 0xce, 0x99, 0x19,
-	0xba, 0xf5, 0xb7, 0x00, 0x65, 0x8c, 0x8c, 0x18, 0x07, 0x17, 0x61, 0x82, 0x07, 0x50, 0xcf, 0xc5,
-	0x40, 0x38, 0x6a, 0x8e, 0xe3, 0xef, 0x8e, 0xcb, 0x50, 0x91, 0x1d, 0xec, 0xd1, 0x34, 0xf0, 0x8d,
-	0xe3, 0xef, 0x8e, 0x4b, 0x66, 0x61, 0x34, 0x3c, 0x0a, 0x68, 0x84, 0x01, 0xae, 0x6c, 0xf2, 0x1f,
-	0x64, 0x15, 0xe6, 0xb4, 0x98, 0x6f, 0xd9, 0xce, 0x81, 0xe5, 0xd3, 0x43, 0xea, 0x63, 0x50, 0x1b,
-	0x36, 0x67, 0x34, 0xe4, 0x9a, 0x73, 0xf0, 0x29, 0x43, 0xb1, 0x28, 0x91, 0x44, 0x76, 0x10, 0xef,
-	0xd2, 0x48, 0x63, 0xe0, 0xf1, 0xac, 0x26, 0x31, 0x3a, 0x75, 0x9c, 0x84, 0x3e, 0x0d, 0xac, 0xd8,
-	0x0b, 0x1c, 0x6a, 0x45, 0x34, 0xa0, 0x47, 0x18, 0xd5, 0x46, 0x59, 0x4c, 0x61, 0x98, 0x2d, 0x86,
-	0x30, 0x19, 0x9c, 0x7c, 0x00, 0x20, 0x77, 0xcd, 0xe6, 0x91, 0xed, 0xf4, 0x3d, 0x2b, 0x0b, 0xea,
-	0xb5, 0x84, 0xac, 0x03, 0x77, 0x65, 0x9a, 0x4e, 0x13, 0x67, 0xf2, 0x4f, 0x22, 0x8b, 0x52, 0xf6,
-	0x31, 0x34, 0x53, 0xfb, 0x0a, 0xc2, 0xc4, 0xdb, 0x95, 0x3b, 0x23, 0x33, 0x0f, 0x1e, 0x0c, 0x2f,
-	0x29, 0xaa, 0xe7, 0x1a, 0xd1, 0x17, 0x22, 0x1d, 0xf9, 0x8b, 0x12, 0x34, 0x64, 0x36, 0x54, 0xb0,
-	0x53, 0xb0, 0x3c, 0xbc, 0x52, 0x59, 0xfd, 0xac, 0x7d, 0xce, 0xb4, 0xba, 0xad, 0x4e, 0xbe, 0x2d,
-	0xb2, 0xae, 0xed, 0xdc, 0x1e, 0x6f, 0x06, 0x49, 0x74, 0x6c, 0x2e, 0x38, 0xc5, 0x58, 0xf2, 0x47,
-	0x25, 0x58, 0x50, 0xea, 0xe4, 0x76, 0xa8, 0x82, 0xba, 0x7c, 0xfa, 0x1d, 0x74, 0xd1, 0xf7, 0x8f,
-	0x2b, 0x32, 0xeb, 0x14, 0xa0, 0xc8, 0x9f, 0x97, 0x60, 0x51, 0x6a, 0xa1, 0x9b, 0x1c, 0xd7, 0xa3,
-	0xfa, 0x5d, 0xf7, 0xc4, 0x4c, 0x45, 0x16, 0xec, 0x49, 0x1e, 0x4b, 0xfe, 0xac, 0xc4, 0x1c, 0x6b,
-	0xaa, 0x85, 0xeb, 0x7f, 0xa9, 0xed, 0xca, 0x24, 0x6a, 0xf3, 0xfc, 0x0d, 0xb4, 0xd1, 0x16, 0x7a,
-	0xec, 0x7f, 0x99, 0xdd, 0x97, 0xf9, 0xa8, 0x10, 0xd9, 0xf8, 0x18, 0x2e, 0x9d, 0x76, 0xb0, 0xa4,
-	0x06, 0xc3, 0x07, 0xf4, 0x58, 0xa4, 0xd4, 0xec, 0x4f, 0x76, 0x97, 0x0f, 0x6d, 0xbf, 0x4f, 0xc5,
-	0x1d, 0xe7, 0x3f, 0x1e, 0x0e, 0x3d, 0x28, 0x35, 0x1c, 0x58, 0x3c, 0xf1, 0x60, 0x0a, 0x04, 0xdd,
-	0xd1, 0x05, 0x9d, 0x7e, 0x53, 0xb4, 0x45, 0x52, 0x85, 0x0b, 0x77, 0xfd, 0xb5, 0x14, 0xee, 0xc0,
-	0xc5, 0x53, 0xf6, 0xec, 0x75, 0x44, 0xb5, 0xfe, 0x75, 0x0c, 0x66, 0x34, 0x59, 0x2c, 0xa5, 0x41,
-	0x7f, 0x99, 0x0f, 0x1a, 0xa5, 0xc2, 0xa0, 0x21, 0xeb, 0x28, 0xe9, 0x3a, 0xcb, 0x26, 0x48, 0x50,
-	0xc7, 0x25, 0x73, 0x30, 0x16, 0xf5, 0x03, 0x86, 0x13, 0xee, 0x33, 0xea, 0x07, 0x1d, 0x97, 0x6c,
-	0x00, 0xe6, 0x3f, 0x18, 0x4d, 0xd1, 0x65, 0x4e, 0xad, 0xbe, 0x5d, 0x68, 0x35, 0x58, 0x81, 0x31,
-	0x53, 0x61, 0x5a, 0xb1, 0xc0, 0x6a, 0x4e, 0x24, 0xe2, 0x2f, 0xbd, 0xae, 0x19, 0xcd, 0xd6, 0x35,
-	0x57, 0x61, 0x6a, 0xd7, 0x8b, 0xe2, 0x44, 0xe4, 0xf0, 0xaa, 0x1a, 0xa8, 0x22, 0x14, 0x73, 0xf7,
-	0x8e, 0x4b, 0x5a, 0x30, 0x19, 0xd0, 0xaf, 0x34, 0xa2, 0x71, 0x24, 0xaa, 0x30, 0xa0, 0xa4, 0xb9,
-	0x02, 0xd5, 0xb4, 0x0a, 0xf1, 0x5c, 0xf4, 0x8c, 0xc3, 0xa6, 0x8a, 0x94, 0x2c, 0x76, 0xb4, 0x61,
-	0x86, 0x4b, 0x60, 0x85, 0x18, 0xcd, 0x38, 0xbc, 0x51, 0xb3, 0x8e, 0xa8, 0x2d, 0x86, 0x91, 0x5e,
-	0xee, 0x87, 0x70, 0x31, 0xa0, 0x47, 0x16, 0xdb, 0x96, 0x22, 0x3e, 0xe0, 0x89, 0x6e, 0x40, 0x8f,
-	0xcc, 0x7e, 0xb0, 0x39, 0xc0, 0x7d, 0x05, 0xaa, 0x3b, 0x91, 0x1d, 0x38, 0xfb, 0x56, 0x12, 0x1e,
-	0xd0, 0x00, 0xab, 0x83, 0xaa, 0x59, 0xe1, 0xb0, 0x6d, 0x06, 0x62, 0x77, 0x74, 0x0e, 0x23, 0xaa,
-	0x7e, 0x51, 0xbd, 0x60, 0x37, 0x14, 0xde, 0xe2, 0xf3, 0x73, 0xdf, 0xcf, 0x02, 0xab, 0x68, 0xb3,
-	0xec, 0x42, 0x83, 0x33, 0x18, 0xbf, 0xa6, 0x33, 0xfe, 0x20, 0x86, 0xdc, 0x86, 0x59, 0xf9, 0xb1,
-	0x19, 0xb5, 0x27, 0x51, 0xed, 0x3a, 0xff, 0xca, 0x75, 0x4d, 0xf9, 0x6b, 0x30, 0x15, 0xd1, 0x98,
-	0xf2, 0x0c, 0x87, 0x19, 0x11, 0x16, 0x0e, 0x13, 0xe6, 0x24, 0x42, 0x5f, 0x0a, 0x20, 0x59, 0x80,
-	0x71, 0x34, 0x20, 0xcf, 0xc5, 0xca, 0x60, 0xd8, 0x1c, 0x63, 0x3f, 0x3b, 0x6e, 0xe3, 0x0f, 0xc0,
-	0x38, 0x49, 0xc3, 0x82, 0x4b, 0xd1, 0xc9, 0xde, 0xe3, 0x77, 0x0b, 0x77, 0x46, 0xdb, 0xc6, 0xdc,
-	0xa6, 0x30, 0xd1, 0xfa, 0x4d, 0xfa, 0xbb, 0x11, 0x98, 0xdc, 0x96, 0x65, 0xc1, 0xf7, 0xe2, 0x0e,
-	0x6d, 0x42, 0x55, 0x56, 0x5a, 0x28, 0x67, 0x14, 0xe5, 0xb4, 0xb2, 0xa9, 0x5c, 0x2a, 0x80, 0x93,
-	0xa2, 0x8c, 0x4a, 0x92, 0xfe, 0x20, 0x14, 0xe6, 0xd4, 0x37, 0xc8, 0x8c, 0x1b, 0xe5, 0x8d, 0xa1,
-	0xbc, 0xbb, 0xa7, 0xeb, 0x25, 0x4f, 0x55, 0xe4, 0xe2, 0x28, 0x7e, 0xe6, 0x68, 0x10, 0xa8, 0xdf,
-	0xf8, 0xf1, 0xec, 0x8d, 0x67, 0x35, 0x94, 0xcc, 0x5e, 0x65, 0x15, 0xc6, 0xef, 0xaa, 0x6a, 0x54,
-	0x88, 0xd2, 0x82, 0xe5, 0x7a, 0xea, 0xc6, 0xf3, 0xac, 0x64, 0x9c, 0x8a, 0xdb, 0xae, 0x59, 0x15,
-	0xe8, 0x56, 0x45, 0x9e, 0xc1, 0xec, 0xa1, 0x17, 0x7b, 0x3b, 0x9e, 0xcf, 0x8a, 0x76, 0xd5, 0x9e,
-	0xc3, 0xdb, 0x77, 0xba, 0xfb, 0x9f, 0x49, 0xf9, 0x14, 0xb0, 0xf5, 0xab, 0x11, 0xa8, 0xc9, 0x98,
-	0xf5, 0xbd, 0x31, 0x95, 0x36, 0xcc, 0x24, 0x76, 0xb4, 0x47, 0x13, 0x2b, 0xa3, 0xe6, 0x28, 0x2e,
-	0x54, 0xe7, 0xa8, 0xe7, 0x9a, 0xb2, 0x2c, 0xdd, 0xe5, 0xf4, 0xba, 0xce, 0x63, 0x48, 0x5e, 0xe3,
-	0x98, 0x97, 0xa9, 0xe6, 0x2d, 0x98, 0x14, 0xd4, 0xe2, 0x03, 0xc6, 0xf9, 0xe7, 0x73, 0xa0, 0x89,
-	0x9f, 0x91, 0xad, 0xa3, 0x27, 0xf2, 0x75, 0xf4, 0x23, 0x68, 0x08, 0x11, 0xce, 0xbe, 0xe7, 0xbb,
-	0xe9, 0xb2, 0x61, 0xe0, 0x1f, 0xe3, 0x51, 0x4f, 0x98, 0x0b, 0x9c, 0x62, 0x83, 0x11, 0xc8, 0xd5,
-	0x3f, 0x0b, 0xfc, 0xe3, 0x7c, 0xf9, 0x03, 0x03, 0xe5, 0x8f, 0x66, 0x7b, 0x95, 0xac, 0xed, 0x69,
-	0x56, 0x53, 0x3d, 0x97, 0xd5, 0x4c, 0xbe, 0x91, 0xd5, 0x90, 0x9b, 0x50, 0x8f, 0xa8, 0x13, 0x46,
-	0xae, 0x95, 0x62, 0x85, 0x77, 0xac, 0x71, 0xc4, 0x17, 0x0a, 0xde, 0xea, 0x03, 0x79, 0xca, 0x5b,
-	0x83, 0xdc, 0xbb, 0x9a, 0xac, 0x9c, 0x21, 0x17, 0xa1, 0x2c, 0xdc, 0xb0, 0x32, 0xb0, 0x09, 0x0e,
-	0xe0, 0x47, 0xb0, 0x43, 0xf7, 0xbc, 0xc0, 0x0a, 0x42, 0x57, 0xab, 0x84, 0x2a, 0x08, 0x7c, 0x1e,
-	0xba, 0x6c, 0x17, 0x9a, 0x50, 0xa1, 0x81, 0xab, 0x28, 0x86, 0x79, 0x93, 0x8d, 0x06, 0x2e, 0xc7,
-	0xb7, 0xfe, 0xba, 0x04, 0x93, 0x99, 0x75, 0x71, 0x77, 0x22, 0xaa, 0x59, 0xf4, 0x18, 0xfb, 0xd9,
-	0x71, 0xb3, 0xba, 0x0c, 0xe5, 0x74, 0xf9, 0x29, 0x94, 0xed, 0xc0, 0xa1, 0x4c, 0x50, 0x6c, 0x0c,
-	0x63, 0xd8, 0x7a, 0x74, 0xee, 0xb0, 0x35, 0xf8, 0xe1, 0x66, 0x2a, 0xad, 0xf5, 0x8f, 0x25, 0x98,
-	0x16, 0x14, 0xdb, 0x4c, 0x13, 0x76, 0xf7, 0x5e, 0x42, 0x45, 0xea, 0xc2, 0xe2, 0x64, 0x09, 0x0f,
-	0xe8, 0xfe, 0x1b, 0x2e, 0x08, 0xe2, 0x2b, 0x98, 0xe0, 0xf7, 0xa1, 0xbc, 0x1b, 0x46, 0x07, 0xbc,
-	0x94, 0x3d, 0x3b, 0x59, 0x9c, 0x60, 0xc4, 0xec, 0x27, 0x21, 0x30, 0x82, 0xaa, 0xf0, 0x7b, 0x8c,
-	0x7f, 0xb7, 0xfe, 0xb9, 0x04, 0x65, 0x0c, 0x2f, 0x67, 0xb4, 0x75, 0xb3, 0x8d, 0xd0, 0xa1, 0x7c,
-	0x23, 0xf4, 0x11, 0x54, 0xb0, 0xa9, 0xc2, 0x4d, 0x12, 0x57, 0x38, 0x5d, 0x2b, 0xe0, 0xe4, 0xa8,
-	0xd7, 0x12, 0x54, 0xf4, 0x5e, 0x18, 0x2f, 0x77, 0xf1, 0x5a, 0x8a, 0x36, 0xd8, 0x22, 0x4c, 0xf0,
-	0x62, 0x49, 0xf9, 0x86, 0x71, 0xfc, 0xdd, 0x71, 0x5b, 0xff, 0x5d, 0x82, 0x89, 0xff, 0x0b, 0x77,
-	0x97, 0xbb, 0xcb, 0x23, 0x03, 0x77, 0xf9, 0x43, 0xa8, 0x3a, 0x11, 0x4d, 0x7b, 0x0c, 0xa3, 0x67,
-	0x6e, 0x41, 0x45, 0xd0, 0xe3, 0x1e, 0xac, 0xc2, 0x18, 0xdf, 0x11, 0xf4, 0x66, 0xa7, 0x33, 0x0a,
-	0xca, 0x56, 0x0c, 0xf5, 0x35, 0xdf, 0x0f, 0x1d, 0x14, 0x22, 0xf7, 0x60, 0x13, 0x46, 0x5c, 0x3b,
-	0xb1, 0x85, 0xbd, 0xdd, 0x3d, 0xb7, 0xbd, 0x49, 0x01, 0x26, 0xb2, 0xeb, 0x0e, 0x68, 0x42, 0x77,
-	0x40, 0xad, 0x7f, 0x1f, 0x82, 0xc9, 0x6d, 0xe9, 0x1f, 0xcf, 0xbb, 0xeb, 0x04, 0x46, 0x70, 0x14,
-	0xc1, 0xb7, 0x1b, 0xff, 0x26, 0x6b, 0x7a, 0x00, 0x19, 0xc6, 0x00, 0x72, 0xf5, 0xa4, 0x1c, 0x41,
-	0xae, 0x97, 0x0b, 0x1f, 0x0f, 0x60, 0xe4, 0xc0, 0x0b, 0x5c, 0x91, 0x61, 0x9c, 0xc9, 0xfd, 0x89,
-	0x17, 0xb8, 0x26, 0x72, 0x30, 0x47, 0x91, 0x96, 0x98, 0x3c, 0x91, 0x9f, 0xb0, 0x65, 0x79, 0x9c,
-	0x9e, 0xc5, 0xf8, 0x79, 0xcf, 0x82, 0x1d, 0x3f, 0xe6, 0xc7, 0xa2, 0x07, 0x72, 0x8e, 0x76, 0x47,
-	0x85, 0xd1, 0x8b, 0xce, 0x52, 0xeb, 0x4f, 0x86, 0x00, 0xb6, 0xbc, 0xbd, 0xc0, 0xf6, 0xcf, 0x1e,
-	0xaf, 0xf0, 0xee, 0x6b, 0x72, 0xe2, 0x78, 0x45, 0xe1, 0x33, 0xe3, 0x95, 0xec, 0x00, 0x60, 0x38,
-	0x3f, 0x00, 0x90, 0x27, 0x34, 0xa2, 0x9d, 0xd0, 0x7d, 0x18, 0xf5, 0x82, 0x5e, 0x3f, 0x11, 0xb6,
-	0x7c, 0x76, 0x33, 0x8e, 0x93, 0x33, 0xed, 0x9d, 0x30, 0x48, 0xa2, 0xd0, 0x17, 0xa1, 0x59, 0xfe,
-	0x64, 0xa6, 0x92, 0x6a, 0x9f, 0x56, 0x47, 0x0a, 0xd6, 0x71, 0x5b, 0xff, 0x50, 0x82, 0xba, 0x68,
-	0x96, 0x6f, 0x60, 0xe7, 0xfc, 0xb7, 0xb5, 0x21, 0x85, 0x3d, 0x7b, 0xbe, 0x2f, 0x03, 0x3d, 0xfb,
-	0xbc, 0xde, 0x23, 0x83, 0x7a, 0xff, 0x57, 0x09, 0xe6, 0x65, 0xf4, 0xdf, 0xfc, 0x8a, 0x3a, 0x7d,
-	0x96, 0xcc, 0x33, 0xff, 0x45, 0x71, 0x25, 0xbc, 0xea, 0xfa, 0x4a, 0x25, 0xb1, 0x12, 0x22, 0xd2,
-	0x95, 0x52, 0xf7, 0x33, 0xa4, 0xbb, 0x9f, 0x8f, 0x61, 0x94, 0x79, 0x47, 0x79, 0x51, 0xee, 0x9d,
-	0x2f, 0xf9, 0xcd, 0xea, 0x61, 0x72, 0x11, 0xe4, 0x09, 0x8c, 0x69, 0x9e, 0x76, 0x6a, 0xb5, 0x7d,
-	0xc2, 0xbd, 0x29, 0x94, 0xd2, 0x8f, 0x4d, 0xc1, 0xdd, 0xfa, 0x7a, 0x11, 0xe6, 0x06, 0x68, 0x0a,
-	0x3d, 0xc2, 0x87, 0x67, 0xfa, 0xe1, 0x8f, 0x06, 0xfc, 0x70, 0x1b, 0x66, 0x7a, 0x76, 0xc4, 0x8e,
-	0xb3, 0xc0, 0xb9, 0xd4, 0x39, 0x2a, 0x97, 0x1a, 0x0a, 0xfa, 0x41, 0xff, 0x5e, 0xe3, 0x98, 0x6c,
-	0x6a, 0x28, 0xa8, 0x33, 0xce, 0xbe, 0xc2, 0x81, 0x3c, 0x35, 0x3c, 0xfb, 0xd0, 0xc9, 0x07, 0xb0,
-	0xe8, 0x84, 0xdd, 0x9e, 0x4f, 0xb1, 0x1e, 0xce, 0x59, 0x1f, 0x6f, 0x20, 0xcc, 0xa7, 0x04, 0x19,
-	0xf3, 0xbb, 0x01, 0xb5, 0x3c, 0x2b, 0xde, 0x96, 0xaa, 0x39, 0x9d, 0xe3, 0x20, 0x0f, 0x0b, 0x56,
-	0x51, 0x33, 0x44, 0x9e, 0xd3, 0x2e, 0xe4, 0x78, 0xd4, 0x18, 0xf1, 0x8c, 0xfc, 0xf6, 0x16, 0x10,
-	0xb5, 0x5d, 0xcc, 0x11, 0xf3, 0x89, 0x71, 0x99, 0xef, 0x9a, 0xc4, 0x30, 0x5f, 0x8b, 0x63, 0xe3,
-	0x4f, 0xa0, 0xa5, 0xa8, 0xa9, 0x3c, 0xf1, 0x81, 0xb1, 0x1a, 0xef, 0x36, 0x2c, 0x1d, 0xe5, 0x4d,
-	0x23, 0x37, 0x5e, 0xfb, 0x1d, 0xb8, 0xa4, 0x84, 0xb1, 0x43, 0xc8, 0x8b, 0xa9, 0xa0, 0x98, 0x45,
-	0x49, 0x63, 0xf6, 0xf3, 0x02, 0xd6, 0xe0, 0x72, 0xaa, 0x3b, 0x46, 0x92, 0xc2, 0x79, 0x65, 0x43,
-	0x7d, 0x06, 0x0b, 0x1b, 0x59, 0x11, 0x72, 0x7e, 0xab, 0x3a, 0x25, 0xbc, 0xf0, 0xe7, 0xf3, 0x5b,
-	0xd9, 0x1e, 0xb9, 0x0e, 0xd3, 0x4e, 0x3f, 0x42, 0x63, 0x91, 0x64, 0x35, 0x24, 0x9b, 0x12, 0x60,
-	0x49, 0xe8, 0x40, 0x2d, 0xd3, 0xc7, 0x64, 0x61, 0xb8, 0x8e, 0xae, 0xf3, 0xc1, 0x9b, 0xb4, 0x47,
-	0x1e, 0xdb, 0x89, 0x6d, 0x4e, 0x47, 0x59, 0x00, 0xb9, 0x09, 0x04, 0x03, 0x0d, 0x37, 0x03, 0x19,
-	0xa3, 0x67, 0x78, 0x5d, 0xca, 0x30, 0x78, 0xfe, 0xdb, 0xbc, 0x5a, 0xf8, 0x01, 0xcc, 0xf0, 0x51,
-	0x51, 0xb6, 0x73, 0x35, 0xcb, 0xe7, 0x03, 0x0c, 0xf5, 0x44, 0xef, 0x5e, 0xdd, 0x01, 0x1c, 0xa7,
-	0x58, 0xbd, 0x28, 0x74, 0x68, 0x1c, 0xab, 0xa9, 0xf6, 0x1c, 0x9f, 0x8f, 0x33, 0xdc, 0x0b, 0x89,
-	0xe2, 0xa6, 0xb9, 0x22, 0xe6, 0x8c, 0xfa, 0x1c, 0x6d, 0x9e, 0x6f, 0x4e, 0x2c, 0x87, 0xc3, 0x7c,
-	0x7a, 0xf6, 0x1e, 0x2c, 0xe8, 0x01, 0x52, 0x67, 0x58, 0x40, 0x86, 0x59, 0x2d, 0x1e, 0xa6, 0x6c,
-	0x37, 0xa0, 0xe6, 0x52, 0xc7, 0x8b, 0xf5, 0xbe, 0xbf, 0xc1, 0x3f, 0x56, 0xc2, 0xe5, 0xf6, 0xdf,
-	0x81, 0x59, 0x45, 0xaa, 0xe7, 0x6a, 0x8b, 0x5c, 0x7b, 0x89, 0xdb, 0x4a, 0x73, 0xb6, 0x36, 0xcc,
-	0xa4, 0x1c, 0x69, 0x76, 0xcb, 0x07, 0x81, 0x75, 0xc5, 0xa0, 0xb2, 0x5c, 0x5d, 0x19, 0x61, 0x6c,
-	0x38, 0xf8, 0x1b, 0x4d, 0x95, 0x11, 0x06, 0x96, 0x21, 0x95, 0xcd, 0x83, 0x4b, 0x59, 0xbd, 0x65,
-	0xf3, 0xe0, 0x77, 0x61, 0x79, 0x40, 0x0b, 0x55, 0xd8, 0x89, 0x2d, 0xba, 0x8c, 0xac, 0x97, 0x73,
-	0x2a, 0xa9, 0x64, 0x82, 0xef, 0xd5, 0x27, 0xd0, 0x1a, 0xd8, 0x80, 0x41, 0x51, 0x4d, 0x14, 0xb5,
-	0x94, 0xdf, 0x8e, 0xbc, 0xb0, 0xa2, 0xe9, 0xf7, 0x52, 0xf1, 0xf4, 0xfb, 0x67, 0x70, 0x53, 0xad,
-	0x1b, 0x46, 0xde, 0x9e, 0x17, 0xd8, 0xfe, 0x29, 0x0a, 0xf0, 0x31, 0xe0, 0x75, 0xc9, 0xf2, 0x99,
-	0xe0, 0x38, 0x49, 0x11, 0xfd, 0x90, 0xb4, 0xf8, 0xd9, 0xe2, 0x81, 0x40, 0xa2, 0x32, 0xf3, 0xf5,
-	0xc1, 0xb8, 0xfe, 0x56, 0x71, 0x5c, 0x7f, 0x07, 0xea, 0x71, 0xe2, 0x39, 0x07, 0xc7, 0x96, 0xe6,
-	0x24, 0xaf, 0xca, 0x39, 0x39, 0x43, 0xa8, 0xe4, 0x91, 0x3c, 0x81, 0x65, 0x41, 0x7b, 0xe2, 0x4b,
-	0x09, 0xe3, 0x1a, 0x9f, 0x48, 0x71, 0xba, 0xad, 0xc2, 0x77, 0x12, 0xcc, 0xe7, 0xf0, 0xa1, 0xab,
-	0x34, 0x8b, 0xb7, 0xb9, 0xcf, 0x41, 0xa0, 0xb4, 0x89, 0xb3, 0x47, 0xed, 0xd7, 0x7f, 0x13, 0xa3,
-	0xf6, 0x95, 0xef, 0x32, 0x6a, 0xbf, 0x71, 0xca, 0xa8, 0xfd, 0xd4, 0x59, 0xf9, 0x3b, 0xa7, 0xcf,
-	0xca, 0xcf, 0x18, 0xd3, 0xdf, 0x3c, 0x63, 0x4c, 0x7f, 0x8e, 0x51, 0xfb, 0xad, 0xb3, 0x47, 0xed,
-	0x45, 0xaf, 0x22, 0x7e, 0x50, 0xf8, 0x2a, 0xe2, 0x2d, 0x98, 0x74, 0x22, 0xed, 0xc6, 0x19, 0x6d,
-	0xb4, 0x9f, 0x2a, 0x03, 0x4a, 0x13, 0x38, 0xa9, 0xa1, 0x7f, 0xfb, 0xa4, 0x86, 0xfe, 0x2d, 0x20,
-	0x22, 0x9b, 0xd0, 0x3b, 0xdc, 0x77, 0x30, 0x3f, 0xa8, 0x21, 0x46, 0x6f, 0x70, 0x5f, 0x81, 0x6a,
-	0x8c, 0xc5, 0x83, 0x78, 0xc7, 0x75, 0x57, 0x4c, 0x14, 0x10, 0x86, 0x2f, 0xb8, 0x18, 0x89, 0x7a,
-	0xf1, 0xe5, 0xfd, 0x9c, 0x1a, 0xab, 0x9c, 0x44, 0x3e, 0xf5, 0xf2, 0x7e, 0x4e, 0xd9, 0x49, 0x3b,
-	0x3e, 0x3b, 0x01, 0xcb, 0xf7, 0x76, 0x22, 0x3b, 0x3a, 0x56, 0x6a, 0xbe, 0xcb, 0xdf, 0x29, 0x71,
-	0xec, 0xa7, 0x1c, 0x29, 0x35, 0x4d, 0xb9, 0x76, 0xa9, 0x9d, 0xf4, 0xb5, 0x8f, 0xbb, 0xa7, 0x73,
-	0x3d, 0xe1, 0x48, 0xc9, 0xb5, 0x04, 0x15, 0xc1, 0xe5, 0x75, 0x7b, 0xbe, 0xf1, 0x1e, 0x4f, 0xff,
-	0x38, 0xa8, 0xd3, 0xed, 0xf9, 0xec, 0x66, 0xda, 0xfd, 0x24, 0xb4, 0x78, 0xe3, 0xbe, 0x17, 0x7a,
-	0x41, 0x12, 0x1b, 0xf7, 0x79, 0x7e, 0xc4, 0x10, 0x26, 0x83, 0xbf, 0x40, 0x30, 0x79, 0x04, 0x8d,
-	0x01, 0xda, 0x34, 0x41, 0x7a, 0x9f, 0x27, 0x48, 0x39, 0x26, 0x95, 0x20, 0xfd, 0x61, 0x09, 0xea,
-	0x31, 0xb5, 0x23, 0x67, 0x9f, 0x59, 0x76, 0xe4, 0xed, 0xf4, 0x13, 0x1a, 0x1b, 0x0f, 0xb0, 0x3d,
-	0xb4, 0x7d, 0xee, 0xb0, 0x5d, 0x98, 0x07, 0xb7, 0xb7, 0x50, 0xee, 0x9a, 0x12, 0xcb, 0x87, 0x1a,
-	0xb5, 0x38, 0x07, 0x26, 0x3f, 0x83, 0x91, 0x2e, 0xed, 0x86, 0xc6, 0x07, 0xb8, 0xea, 0xd3, 0xef,
-	0xb8, 0xea, 0x33, 0xda, 0x15, 0xe3, 0x13, 0x94, 0x4a, 0x6e, 0x42, 0x5d, 0x1c, 0x89, 0xc5, 0x8f,
-	0xdb, 0xa3, 0xb1, 0xf1, 0x90, 0x9b, 0x92, 0x40, 0x3c, 0x95, 0x70, 0xf2, 0x43, 0x68, 0x0c, 0x10,
-	0xa7, 0x7b, 0xf9, 0x08, 0xf7, 0xd2, 0xc8, 0x73, 0xc9, 0xcd, 0x6c, 0xb8, 0x30, 0x57, 0xf8, 0xcd,
-	0x05, 0x63, 0x92, 0xf7, 0xb2, 0x63, 0x92, 0xa5, 0x33, 0x8a, 0x4b, 0x7d, 0x4e, 0xf9, 0x13, 0x28,
-	0xab, 0x6f, 0xfc, 0x8d, 0x4a, 0x6e, 0xfd, 0xa2, 0x04, 0x13, 0x1b, 0xfb, 0xd4, 0x39, 0x88, 0xfb,
-	0xdd, 0x7c, 0xcd, 0x39, 0x9a, 0xd6, 0x9c, 0x8f, 0x61, 0x6c, 0xd7, 0xb7, 0x0f, 0xc3, 0x08, 0x97,
-	0x98, 0x5a, 0xbd, 0x75, 0x7a, 0x39, 0x26, 0x25, 0x3e, 0x41, 0x1e, 0x53, 0xf0, 0xa6, 0xd3, 0x53,
-	0xfe, 0xcc, 0x91, 0xff, 0x68, 0xfd, 0xe5, 0x28, 0x10, 0x6c, 0x25, 0x67, 0x4b, 0xaa, 0xdf, 0x4e,
-	0x47, 0x40, 0x4b, 0x7a, 0x86, 0xf3, 0x2d, 0xbd, 0xeb, 0x30, 0x9d, 0x93, 0x8b, 0x15, 0x50, 0xd5,
-	0x9c, 0xca, 0x8a, 0x23, 0x0f, 0x06, 0x15, 0x50, 0x06, 0xc3, 0xbb, 0x75, 0xf3, 0x59, 0x0e, 0x75,
-	0xf7, 0xda, 0x30, 0x23, 0x35, 0x18, 0xec, 0xe7, 0xd7, 0x05, 0x4a, 0xab, 0xda, 0xae, 0xc2, 0x94,
-	0xa4, 0xcf, 0x74, 0xf4, 0xe5, 0x7b, 0x4b, 0x5e, 0xb7, 0x0d, 0x3c, 0xca, 0x9c, 0x78, 0xad, 0x47,
-	0x99, 0xe5, 0x53, 0x1e, 0x65, 0x16, 0x56, 0xf2, 0x50, 0x5c, 0xc9, 0x5f, 0x82, 0xb2, 0xaa, 0x5c,
-	0xe5, 0x83, 0x4b, 0x05, 0x38, 0xa1, 0xf0, 0xaa, 0x9e, 0x50, 0x78, 0xfd, 0x44, 0x15, 0xc3, 0xfc,
-	0x21, 0xa4, 0x08, 0x48, 0x93, 0x68, 0x7d, 0x2b, 0x27, 0xd4, 0xef, 0x2f, 0x90, 0x03, 0x5f, 0x45,
-	0xf2, 0x50, 0x25, 0xcb, 0x66, 0x0d, 0x34, 0x50, 0xe4, 0x4e, 0x0d, 0x76, 0x36, 0xfe, 0x63, 0x18,
-	0xa6, 0x55, 0xa5, 0xcd, 0x5f, 0x58, 0x91, 0x8f, 0x45, 0x2b, 0xf9, 0x75, 0xbb, 0xda, 0x69, 0xc5,
-	0x8e, 0xad, 0x46, 0x26, 0x83, 0xbc, 0x80, 0x31, 0x27, 0x0c, 0x76, 0xbd, 0x3d, 0x71, 0x61, 0x1f,
-	0xbc, 0xbe, 0xb4, 0x0d, 0xe4, 0x37, 0x85, 0x1c, 0x12, 0x01, 0xd1, 0x0b, 0x31, 0x21, 0x9d, 0x37,
-	0xa5, 0x37, 0x5e, 0x5f, 0xba, 0x56, 0x93, 0x89, 0x85, 0xea, 0x51, 0x1e, 0x44, 0xae, 0xc1, 0x14,
-	0x5f, 0x27, 0xf7, 0x3c, 0x69, 0x92, 0x43, 0x65, 0xe0, 0x5b, 0x87, 0xcb, 0xbb, 0xb6, 0xe7, 0x87,
-	0x87, 0x34, 0x2a, 0x7e, 0xd4, 0xc4, 0x07, 0x41, 0x17, 0x25, 0x51, 0xd1, 0x9b, 0xa6, 0x1b, 0x50,
-	0x53, 0x32, 0x24, 0x1b, 0x9f, 0x12, 0x4d, 0x4b, 0xb8, 0x24, 0x7d, 0x07, 0xea, 0x8a, 0x94, 0x06,
-	0xa2, 0x35, 0x3d, 0x99, 0xa5, 0xdd, 0x0c, 0xf8, 0xcb, 0xb6, 0x7f, 0x1a, 0x82, 0xc9, 0xcc, 0xf9,
-	0x90, 0x29, 0x18, 0x52, 0x2d, 0x97, 0x21, 0xcf, 0x25, 0x1f, 0xa9, 0xce, 0xd1, 0x50, 0x7e, 0xe0,
-	0x97, 0xb1, 0x3c, 0x25, 0x25, 0xdb, 0x31, 0x52, 0x4d, 0xc6, 0x61, 0xad, 0xc9, 0xb8, 0x0c, 0x15,
-	0x97, 0xc6, 0x4e, 0xe4, 0xf5, 0xd8, 0x27, 0x8a, 0xfe, 0xa3, 0x0e, 0x4a, 0x5f, 0xcb, 0x8d, 0xea,
-	0xaf, 0xe5, 0xb6, 0x45, 0x9f, 0x7b, 0x0c, 0x63, 0xe6, 0x8f, 0xde, 0xcc, 0x02, 0xdb, 0xac, 0xa4,
-	0x16, 0xb1, 0x92, 0x49, 0x6b, 0xbc, 0x0f, 0x65, 0x05, 0x3a, 0xeb, 0xc1, 0x4b, 0x59, 0x8f, 0x1c,
-	0xfb, 0xd0, 0x38, 0xd9, 0x5e, 0x98, 0xa3, 0xc3, 0xb7, 0xd8, 0xd4, 0x2a, 0x78, 0x99, 0x5f, 0xe7,
-	0xa8, 0x0d, 0xed, 0x7d, 0x7e, 0x03, 0x26, 0x04, 0x21, 0xdb, 0x6a, 0x96, 0xac, 0xaa, 0xdf, 0xad,
-	0xff, 0xd1, 0xaf, 0x63, 0x6a, 0x7c, 0x11, 0x4d, 0x68, 0x20, 0xfa, 0x0e, 0xc7, 0xb1, 0x88, 0x58,
-	0x93, 0x0a, 0xfa, 0xd8, 0x3e, 0xc6, 0x57, 0xe2, 0xb4, 0xeb, 0x25, 0x56, 0x97, 0x26, 0x91, 0xe7,
-	0xe0, 0x47, 0x4c, 0x98, 0xc0, 0x40, 0xcf, 0x10, 0xc2, 0x7c, 0x3e, 0x8b, 0xde, 0x1e, 0xab, 0x11,
-	0x76, 0xfa, 0xce, 0x01, 0x4d, 0xc4, 0x59, 0x4d, 0x49, 0xf0, 0x3a, 0x42, 0x49, 0x07, 0xaa, 0x3b,
-	0xb6, 0x6b, 0xed, 0x78, 0x81, 0x8d, 0xe9, 0x44, 0x0d, 0xef, 0x56, 0xce, 0x1e, 0xd2, 0xff, 0xef,
-	0x38, 0xbc, 0xdb, 0x5e, 0xb7, 0xdd, 0x75, 0x41, 0x6d, 0x56, 0x76, 0xd2, 0x1f, 0xe4, 0xf7, 0x61,
-	0x41, 0x66, 0xa6, 0x6a, 0x6d, 0xed, 0x55, 0xf4, 0xd4, 0xea, 0xb5, 0x13, 0xac, 0x6c, 0x4d, 0x50,
-	0x0b, 0x23, 0x9b, 0x13, 0x52, 0xb2, 0x60, 0x72, 0x07, 0x66, 0x07, 0xc4, 0xf7, 0x23, 0x0f, 0x3b,
-	0x26, 0x65, 0x93, 0xe4, 0x98, 0x3e, 0x8f, 0x3c, 0xe2, 0x40, 0x43, 0x1b, 0xb1, 0xe6, 0x75, 0x9a,
-	0x7d, 0x1d, 0x9d, 0x8c, 0x54, 0x50, 0x4e, 0xad, 0xfb, 0xb0, 0x50, 0xb4, 0x08, 0xd3, 0x8c, 0xbf,
-	0xd3, 0x9e, 0x1b, 0x64, 0xfd, 0x3c, 0xf2, 0x5a, 0xff, 0x32, 0x04, 0xd3, 0xb9, 0x1e, 0x91, 0xea,
-	0xf2, 0x1c, 0x45, 0x5e, 0x42, 0xd3, 0x2e, 0x4f, 0x29, 0xed, 0xf2, 0xbc, 0x64, 0x18, 0xd9, 0xe5,
-	0xf9, 0xe3, 0x13, 0xdf, 0xf2, 0x0c, 0xe1, 0x5d, 0xfa, 0xf1, 0x9b, 0x36, 0xab, 0x5e, 0xef, 0x1d,
-	0xcf, 0xff, 0xef, 0xb3, 0x9a, 0xbf, 0x29, 0x65, 0x1e, 0xa8, 0x09, 0x7f, 0x19, 0x93, 0x1f, 0x15,
-	0x75, 0x04, 0x2b, 0xab, 0x17, 0x07, 0x06, 0x39, 0x9d, 0x20, 0xb9, 0x7f, 0xef, 0x0b, 0x26, 0x2f,
-	0xd7, 0x2e, 0xec, 0x88, 0x06, 0x1d, 0x3f, 0x0d, 0xbd, 0x63, 0x78, 0x86, 0x98, 0xf4, 0xa4, 0x84,
-	0xa8, 0xf5, 0xe4, 0xeb, 0x6f, 0x9a, 0x17, 0x7e, 0xf9, 0x4d, 0xf3, 0xc2, 0xaf, 0xbf, 0x69, 0x96,
-	0x7e, 0xf1, 0xaa, 0x59, 0xfa, 0xfb, 0x57, 0xcd, 0xd2, 0xbf, 0xbd, 0x6a, 0x96, 0xbe, 0x7e, 0xd5,
-	0x2c, 0xfd, 0xea, 0x55, 0xb3, 0xf4, 0x9f, 0xaf, 0x9a, 0x17, 0x7e, 0xfd, 0xaa, 0x59, 0xfa, 0xab,
-	0x6f, 0x9b, 0x17, 0xbe, 0xfe, 0xb6, 0x79, 0xe1, 0x97, 0xdf, 0x36, 0x2f, 0xfc, 0xde, 0x47, 0x7b,
-	0x61, 0xba, 0x39, 0x5e, 0x78, 0xc6, 0x3f, 0x98, 0x3d, 0xca, 0xc3, 0x76, 0xc6, 0x50, 0xb9, 0x77,
-	0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x07, 0xc2, 0x30, 0x9d, 0xa3, 0x36, 0x00, 0x00,
+	// 4136 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x3b, 0x4b, 0x6c, 0x1c, 0x47,
+	0x76, 0x1a, 0xfe, 0xe7, 0xcd, 0x90, 0x9c, 0x29, 0xfe, 0x9a, 0x23, 0x69, 0x48, 0x8d, 0x25, 0x8b,
+	0xb2, 0xb4, 0xa3, 0x8f, 0x65, 0x59, 0x2b, 0xee, 0x6e, 0x56, 0xa4, 0xa8, 0x68, 0xfc, 0x91, 0xb5,
+	0x4d, 0xda, 0xda, 0x2c, 0x16, 0xe8, 0x34, 0xbb, 0x8b, 0x64, 0x83, 0x3d, 0xdd, 0xe3, 0xee, 0x1e,
+	0xd2, 0xdc, 0x5c, 0x1c, 0x04, 0x49, 0x10, 0x24, 0x40, 0x72, 0xcf, 0x25, 0xc8, 0x29, 0xa7, 0xdc,
+	0x82, 0x3d, 0xe5, 0x18, 0x24, 0xa7, 0xc0, 0xa7, 0x60, 0x8f, 0xb1, 0x8c, 0x00, 0xb9, 0x65, 0x2f,
+	0xb9, 0x07, 0xf5, 0xea, 0xd3, 0xd5, 0x3d, 0x4d, 0x8e, 0x28, 0xef, 0x66, 0xe1, 0x1b, 0xe7, 0xfd,
+	0xea, 0x75, 0xd5, 0xab, 0xf7, 0x2d, 0xc2, 0x7b, 0x09, 0xed, 0xf6, 0xc2, 0xc8, 0xf6, 0x6f, 0xc7,
+	0x34, 0x3a, 0xa2, 0xd1, 0x6d, 0xbb, 0xe7, 0xdd, 0xee, 0xd1, 0x28, 0xf6, 0xe2, 0x84, 0x06, 0x0e,
+	0xdd, 0xf5, 0xc3, 0xdd, 0xf8, 0xf6, 0xd1, 0xdd, 0xdb, 0x5d, 0x1a, 0xc7, 0xf6, 0x3e, 0x6d, 0xf7,
+	0xa2, 0x30, 0x09, 0xc9, 0x75, 0xc9, 0xd6, 0xe6, 0x6c, 0x6d, 0xbb, 0xe7, 0xb5, 0xf3, 0x6c, 0xed,
+	0xa3, 0xbb, 0x8d, 0x95, 0xfd, 0x30, 0xdc, 0xf7, 0xe9, 0x6d, 0x64, 0xdb, 0xed, 0xef, 0xdd, 0x4e,
+	0xbc, 0x2e, 0x8d, 0x13, 0xbb, 0xdb, 0xe3, 0x92, 0x1a, 0xcd, 0x3c, 0xc1, 0x71, 0x64, 0xf7, 0x98,
+	0x24, 0x81, 0xbf, 0xaa, 0x14, 0x64, 0x9a, 0x39, 0x61, 0xb7, 0x1b, 0x06, 0x03, 0xfa, 0xe4, 0xa8,
+	0x68, 0xd0, 0xef, 0xa2, 0xd2, 0xc7, 0x61, 0x74, 0xb8, 0xe7, 0x87, 0xc7, 0x82, 0xea, 0x5a, 0x31,
+	0x55, 0x60, 0x77, 0x69, 0xdc, 0xb3, 0x1d, 0x29, 0xec, 0x7a, 0x86, 0x4c, 0x61, 0x07, 0x57, 0x7d,
+	0xbb, 0x58, 0x5e, 0x62, 0xc7, 0x87, 0xd6, 0xe7, 0x7d, 0xda, 0xa7, 0x85, 0xeb, 0xee, 0xd9, 0x9e,
+	0xdf, 0x8f, 0x0a, 0xc4, 0xdd, 0x28, 0x3a, 0x0b, 0x25, 0x95, 0x7f, 0xba, 0x20, 0xbd, 0x79, 0x26,
+	0x69, 0xee, 0xb3, 0xaf, 0x9f, 0x49, 0xcc, 0xb4, 0x15, 0x84, 0x77, 0x8a, 0x08, 0x23, 0xda, 0xf3,
+	0x3d, 0xc7, 0x4e, 0xbc, 0x82, 0x7d, 0x6f, 0x75, 0xc1, 0xe8, 0x74, 0xbb, 0xfd, 0xc4, 0xde, 0xf5,
+	0xe9, 0xa6, 0xdf, 0x8f, 0x13, 0x1a, 0x7d, 0x4c, 0x13, 0xdb, 0xb5, 0x13, 0x9b, 0x5c, 0x81, 0xaa,
+	0xc3, 0x41, 0x16, 0xdb, 0x43, 0xa3, 0xb4, 0x5a, 0x5a, 0x2b, 0x9b, 0x15, 0x01, 0x7b, 0x6e, 0x77,
+	0x29, 0x69, 0xc3, 0xdc, 0x81, 0x17, 0x27, 0x61, 0x74, 0x62, 0xc5, 0x07, 0x76, 0xe4, 0x5a, 0x4e,
+	0xd8, 0x0f, 0x12, 0x63, 0x64, 0xb5, 0xb4, 0x36, 0x6e, 0xd6, 0x05, 0x6a, 0x9b, 0x61, 0x36, 0x19,
+	0xa2, 0xf5, 0x67, 0x33, 0x50, 0x7d, 0xec, 0x24, 0xde, 0x91, 0x97, 0x9c, 0x74, 0x82, 0xbd, 0x90,
+	0x18, 0x30, 0x79, 0xc4, 0xac, 0x2e, 0x0c, 0x50, 0xfc, 0xa8, 0x29, 0x7f, 0x92, 0xf7, 0xc1, 0x88,
+	0x9d, 0x03, 0xea, 0xf6, 0x7d, 0xea, 0x5a, 0xf4, 0x88, 0x06, 0x89, 0xb5, 0x6b, 0x27, 0xce, 0x81,
+	0xe5, 0xb9, 0x28, 0x7f, 0xd4, 0x5c, 0x50, 0xf8, 0x2d, 0x86, 0xde, 0x60, 0xd8, 0x8e, 0x4b, 0xae,
+	0xc3, 0x6c, 0x8e, 0xd1, 0x18, 0x5d, 0x2d, 0xad, 0x55, 0xcd, 0x99, 0x2c, 0x3d, 0x79, 0x38, 0xb8,
+	0x02, 0x0d, 0x9c, 0xd0, 0xf5, 0x82, 0x7d, 0x63, 0x0c, 0xbf, 0x75, 0x31, 0xcb, 0xb1, 0x25, 0xb0,
+	0xe4, 0x0e, 0xcc, 0xa7, 0x9c, 0xec, 0x42, 0x58, 0x81, 0x1d, 0x84, 0xb1, 0x31, 0x8e, 0x7a, 0x11,
+	0x85, 0xdb, 0xf1, 0xba, 0xf4, 0x39, 0xc3, 0x90, 0xcb, 0x00, 0x71, 0x62, 0x47, 0x09, 0x75, 0x99,
+	0xfe, 0x13, 0x48, 0x57, 0x16, 0x90, 0x8e, 0x4b, 0xde, 0x82, 0x69, 0x89, 0xe6, 0x1a, 0x4f, 0xa2,
+	0xc6, 0x55, 0x01, 0xe4, 0xfa, 0xde, 0x87, 0xc5, 0x0c, 0x51, 0xaa, 0xed, 0x14, 0x6a, 0x3b, 0xaf,
+	0x53, 0x2b, 0x5d, 0x6f, 0x01, 0x91, 0x5c, 0x9a, 0xa6, 0x65, 0xd4, 0xa0, 0x26, 0x30, 0xa9, 0x9e,
+	0x2b, 0x50, 0xb1, 0xc5, 0xf9, 0x30, 0x45, 0x01, 0x05, 0x83, 0x04, 0x75, 0x5c, 0xf6, 0x21, 0x11,
+	0xfd, 0xbc, 0x4f, 0xe3, 0x84, 0xe1, 0x2b, 0x88, 0x2f, 0x0b, 0x48, 0xc7, 0x25, 0xcf, 0xe0, 0x8a,
+	0xfc, 0x7a, 0x2b, 0x09, 0x2d, 0x94, 0x8f, 0xeb, 0x86, 0xfd, 0xc4, 0x8a, 0xa9, 0x13, 0x06, 0x6e,
+	0x6c, 0x54, 0xd1, 0x3c, 0x2e, 0x4b, 0xc2, 0x9d, 0x70, 0x9b, 0x91, 0xed, 0x70, 0xaa, 0x6d, 0x4e,
+	0x94, 0x97, 0xe4, 0xf8, 0x61, 0x4c, 0x07, 0x24, 0x4d, 0xe7, 0x25, 0x6d, 0x32, 0xb2, 0x9c, 0xa4,
+	0x0d, 0x68, 0x0a, 0x3d, 0x4e, 0x13, 0x33, 0x83, 0x62, 0x1a, 0x48, 0x55, 0x2c, 0xe3, 0x11, 0x2c,
+	0x1f, 0x50, 0x3b, 0x4a, 0x76, 0xa9, 0x3d, 0xf8, 0x3d, 0xb3, 0xc8, 0xbe, 0xa4, 0x08, 0x72, 0xbc,
+	0x37, 0xa0, 0xe6, 0xd8, 0x81, 0x43, 0x7d, 0x4b, 0xec, 0x13, 0x75, 0x8d, 0xda, 0x6a, 0x69, 0x6d,
+	0xca, 0x9c, 0xe5, 0x70, 0x53, 0x82, 0xc9, 0x3b, 0x50, 0xcf, 0x92, 0xb2, 0x4d, 0xae, 0xe3, 0x59,
+	0x65, 0x69, 0x3b, 0x48, 0xcb, 0x14, 0x89, 0x2c, 0x74, 0x57, 0x71, 0x62, 0x27, 0xfd, 0xd8, 0x20,
+	0xa8, 0xca, 0x2c, 0x22, 0x76, 0xec, 0xf8, 0x70, 0x1b, 0xc1, 0xec, 0x9a, 0xd9, 0x09, 0x73, 0x0e,
+	0x89, 0x31, 0x87, 0x14, 0xf2, 0x27, 0x3b, 0xcf, 0xd4, 0xdd, 0x19, 0xf3, 0xfc, 0x3c, 0x19, 0xe4,
+	0x27, 0x0c, 0xc0, 0x74, 0x4f, 0xed, 0x96, 0x06, 0x89, 0x97, 0x9c, 0x18, 0x0b, 0x48, 0x34, 0xab,
+	0xac, 0x97, 0x83, 0xc9, 0x1a, 0xd4, 0x0e, 0xec, 0xd8, 0x8a, 0x68, 0x12, 0x9d, 0x58, 0xbd, 0xd0,
+	0xf7, 0x9c, 0x13, 0x63, 0x11, 0x3f, 0x73, 0xe6, 0xc0, 0x8e, 0x4d, 0x06, 0x7e, 0x81, 0x50, 0xb2,
+	0x09, 0x4d, 0x4e, 0xe5, 0x05, 0x5e, 0xe2, 0xd9, 0xbe, 0xe5, 0x05, 0x09, 0x8d, 0x8e, 0x6c, 0x5f,
+	0xed, 0xe8, 0x12, 0x2a, 0x79, 0x11, 0xa9, 0x3a, 0x9c, 0xa8, 0x23, 0x68, 0xe4, 0xae, 0x2a, 0x21,
+	0x5d, 0xfb, 0x0b, 0xaf, 0xdb, 0xef, 0x0e, 0x0a, 0x31, 0x34, 0x21, 0x1f, 0x73, 0xa2, 0xbc, 0x90,
+	0xfb, 0xb0, 0x98, 0x15, 0x22, 0xb6, 0x25, 0x36, 0x96, 0x91, 0x79, 0x5e, 0x67, 0x7e, 0x2c, 0x70,
+	0xe4, 0x87, 0xc0, 0x85, 0x5a, 0xf4, 0x8b, 0x9e, 0x17, 0xa1, 0x67, 0xd5, 0xef, 0x56, 0x03, 0xcf,
+	0xcb, 0x40, 0x92, 0x2d, 0x45, 0x91, 0xde, 0xb1, 0x47, 0xb0, 0xcc, 0xd9, 0x77, 0x6d, 0xe7, 0x30,
+	0xdc, 0xdb, 0xb3, 0x9c, 0x90, 0xee, 0xed, 0x79, 0x8e, 0xc7, 0x2e, 0xfe, 0xc5, 0xd5, 0xd2, 0x5a,
+	0xc9, 0x5c, 0x42, 0x82, 0x0d, 0x8e, 0xdf, 0x4c, 0xd1, 0xe4, 0x09, 0xac, 0x70, 0xde, 0x20, 0x0c,
+	0xf8, 0x56, 0x33, 0xcf, 0x6d, 0xd1, 0x28, 0x0a, 0x23, 0x2b, 0x39, 0xe9, 0xd1, 0xd8, 0xb8, 0xb4,
+	0x3a, 0xba, 0x56, 0x16, 0x9f, 0xfd, 0x3c, 0x0c, 0x4c, 0x49, 0xb4, 0xc5, 0x68, 0x76, 0x18, 0x09,
+	0x79, 0x0e, 0x84, 0x4b, 0xf1, 0xed, 0x38, 0xb1, 0x44, 0x3c, 0x33, 0x2e, 0xaf, 0x96, 0xd6, 0x2a,
+	0xf7, 0x56, 0xdb, 0x2a, 0x35, 0x60, 0x39, 0x81, 0x40, 0xb6, 0x8f, 0xee, 0xb6, 0x9f, 0xf2, 0x3f,
+	0xcd, 0x1a, 0xf2, 0x7e, 0x64, 0xc7, 0x89, 0x80, 0x90, 0x75, 0x68, 0x68, 0xf2, 0x58, 0xf4, 0xa2,
+	0x51, 0x6a, 0x2f, 0x4d, 0xb4, 0x97, 0x25, 0xc5, 0xf5, 0x12, 0xf1, 0xca, 0x6e, 0xae, 0x40, 0x55,
+	0x85, 0x68, 0x66, 0xee, 0x2b, 0x3c, 0xcc, 0x28, 0x58, 0xc7, 0x65, 0x5e, 0x49, 0xf9, 0x02, 0xcf,
+	0x35, 0x56, 0x71, 0x83, 0x41, 0x82, 0x3a, 0x2e, 0xf9, 0x0c, 0x16, 0x71, 0xe9, 0xf4, 0x8e, 0xba,
+	0x34, 0xb1, 0x3d, 0x3f, 0x36, 0xae, 0x14, 0x7d, 0x94, 0x08, 0xc5, 0x47, 0x77, 0xdb, 0x2f, 0xec,
+	0x13, 0x3f, 0xb4, 0xdd, 0xd8, 0x9c, 0x67, 0xfc, 0xcf, 0x24, 0xfb, 0x13, 0xce, 0x4d, 0x5e, 0x42,
+	0x23, 0x27, 0xb7, 0xdf, 0x73, 0xed, 0x84, 0x7b, 0x10, 0xa3, 0x85, 0xb2, 0x1b, 0x6d, 0x9e, 0x01,
+	0xb5, 0x65, 0x06, 0xd4, 0xde, 0x91, 0x29, 0x92, 0xb9, 0x94, 0x91, 0xfa, 0x29, 0xf2, 0x32, 0x6c,
+	0xeb, 0x1f, 0x01, 0xca, 0x18, 0x17, 0x31, 0x0a, 0x2e, 0xc3, 0x14, 0x0f, 0x9f, 0x9e, 0x8b, 0x61,
+	0x70, 0xdc, 0x9c, 0xc4, 0xdf, 0x1d, 0x97, 0xa1, 0x22, 0x3b, 0xd8, 0xa7, 0x69, 0xd8, 0x9b, 0xc4,
+	0xdf, 0x1d, 0x97, 0xcc, 0xc3, 0x78, 0x78, 0x1c, 0xd0, 0x08, 0xc3, 0x5b, 0xd9, 0xe4, 0x3f, 0xc8,
+	0x3d, 0x58, 0xd0, 0x22, 0xbe, 0x65, 0x3b, 0x87, 0x96, 0x4f, 0x8f, 0xa8, 0x8f, 0x21, 0x6d, 0xd4,
+	0x9c, 0xd3, 0x90, 0x8f, 0x9d, 0xc3, 0x8f, 0x18, 0x8a, 0xc5, 0x88, 0x24, 0xb2, 0x83, 0x78, 0x8f,
+	0x46, 0x1a, 0x03, 0x8f, 0x66, 0x35, 0x89, 0xd1, 0xa9, 0xe3, 0x24, 0xf4, 0x69, 0x60, 0xc5, 0x5e,
+	0xe0, 0x50, 0x2b, 0xa2, 0x01, 0x3d, 0xc6, 0x98, 0x36, 0xce, 0x22, 0x0a, 0xc3, 0x6c, 0x33, 0x84,
+	0xc9, 0xe0, 0x64, 0x1d, 0x2a, 0xfa, 0x9e, 0x4d, 0x0e, 0xdd, 0x33, 0xe8, 0xab, 0x6d, 0x22, 0x1f,
+	0xc2, 0x3c, 0xf7, 0x71, 0x4a, 0x2b, 0x2e, 0x65, 0x6a, 0xa8, 0x14, 0xee, 0x1b, 0xa5, 0xce, 0x28,
+	0xec, 0x09, 0x34, 0x53, 0x43, 0x0b, 0xc2, 0xc4, 0xdb, 0x93, 0x9b, 0x24, 0x53, 0x10, 0x1e, 0x15,
+	0x2f, 0x29, 0xaa, 0xe7, 0x1a, 0xd1, 0x67, 0x22, 0x2f, 0xf9, 0xab, 0x12, 0x34, 0x64, 0x5a, 0x54,
+	0xb0, 0x69, 0xb0, 0x3a, 0xba, 0x56, 0xb9, 0xf7, 0x49, 0xfb, 0x35, 0xf3, 0xeb, 0xb6, 0x32, 0x82,
+	0xb6, 0x48, 0xbf, 0x76, 0x72, 0xdb, 0xbd, 0x15, 0x24, 0xd1, 0x89, 0xb9, 0xe4, 0x14, 0x63, 0xc9,
+	0x9f, 0x94, 0x60, 0x49, 0xa9, 0x93, 0xdd, 0x2a, 0xa3, 0x82, 0xba, 0x7c, 0xf4, 0x2d, 0x74, 0xd1,
+	0xf7, 0x90, 0x2b, 0x32, 0xef, 0x14, 0xa0, 0xc8, 0x5f, 0x96, 0x60, 0x59, 0x6a, 0xa1, 0x5b, 0x1f,
+	0xd7, 0xa3, 0xfa, 0x6d, 0xf7, 0xc4, 0x4c, 0x45, 0x16, 0xec, 0x49, 0x1e, 0x4b, 0xfe, 0xa2, 0xc4,
+	0x3c, 0x6c, 0xaa, 0x85, 0xeb, 0x7f, 0xae, 0xed, 0xca, 0x34, 0x6a, 0xf3, 0xfc, 0x0d, 0xb4, 0xd1,
+	0x16, 0x7a, 0xe2, 0x7f, 0x9e, 0xdd, 0x97, 0xc5, 0xa8, 0x10, 0xd9, 0xf8, 0x00, 0x2e, 0x9d, 0x75,
+	0xb0, 0xa4, 0x06, 0xa3, 0x87, 0xf4, 0x44, 0xe4, 0xd6, 0xec, 0x4f, 0x76, 0xad, 0x8f, 0x6c, 0xbf,
+	0x4f, 0xc5, 0x75, 0xe7, 0x3f, 0x1e, 0x8d, 0x3c, 0x2c, 0x35, 0x1c, 0x58, 0x3e, 0xf5, 0x60, 0x0a,
+	0x04, 0xdd, 0xd1, 0x05, 0x9d, 0x7d, 0x5b, 0xb4, 0x45, 0x52, 0x85, 0x0b, 0x77, 0xfd, 0x5c, 0x0a,
+	0x77, 0xe0, 0xe2, 0x19, 0x7b, 0x76, 0x1e, 0x51, 0xad, 0x7f, 0x9d, 0x80, 0x39, 0x4d, 0x16, 0xcb,
+	0x6d, 0xd0, 0x75, 0xe6, 0xa3, 0x47, 0xa9, 0x30, 0x7a, 0xc8, 0x82, 0x4a, 0x7a, 0xd1, 0xb2, 0x09,
+	0x12, 0xd4, 0x71, 0xc9, 0x02, 0x4c, 0x44, 0xfd, 0x80, 0xe1, 0x84, 0x27, 0x8d, 0xfa, 0x41, 0xc7,
+	0x25, 0x9b, 0x80, 0x89, 0x10, 0x86, 0x55, 0xf4, 0x9e, 0x33, 0xf7, 0xde, 0x2e, 0xb4, 0x1a, 0x2c,
+	0xc5, 0x98, 0xa9, 0x30, 0xad, 0x58, 0x84, 0x35, 0xa7, 0x12, 0xf1, 0x97, 0x5e, 0xe0, 0x8c, 0x67,
+	0x0b, 0x9c, 0xab, 0x30, 0xb3, 0xe7, 0x45, 0x71, 0x22, 0x92, 0x79, 0x55, 0x16, 0x54, 0x11, 0x8a,
+	0x49, 0x7c, 0xc7, 0x25, 0x2d, 0x98, 0x0e, 0xe8, 0x17, 0x1a, 0xd1, 0x24, 0x12, 0x55, 0x18, 0x50,
+	0xd2, 0x5c, 0x81, 0x6a, 0x5a, 0x8e, 0x78, 0x2e, 0x7a, 0xc7, 0x51, 0x53, 0x85, 0x4c, 0x16, 0x46,
+	0xda, 0x30, 0xc7, 0x25, 0xb0, 0x8a, 0x8c, 0x66, 0x1c, 0xde, 0xb8, 0x59, 0x47, 0xd4, 0x36, 0xc3,
+	0x48, 0x2f, 0xf7, 0x03, 0xb8, 0x18, 0xd0, 0x63, 0x8b, 0x6d, 0x4b, 0x11, 0x1f, 0xf0, 0x8c, 0x37,
+	0xa0, 0xc7, 0x66, 0x3f, 0xd8, 0x1a, 0xe0, 0xbe, 0x02, 0xd5, 0xdd, 0xc8, 0x0e, 0x9c, 0x03, 0x2b,
+	0x09, 0x0f, 0x69, 0x80, 0x65, 0x42, 0xd5, 0xac, 0x70, 0xd8, 0x0e, 0x03, 0xb1, 0x3b, 0xba, 0x80,
+	0xa1, 0x55, 0xbf, 0xa8, 0x5e, 0xb0, 0x17, 0x0a, 0x6f, 0xf1, 0xe9, 0x6b, 0xdf, 0xcf, 0x02, 0xab,
+	0x68, 0xb3, 0x34, 0x43, 0x83, 0x33, 0x18, 0xbf, 0xa6, 0x73, 0xfe, 0x20, 0x86, 0xdc, 0x86, 0x79,
+	0xf9, 0xb1, 0x19, 0xb5, 0xa7, 0x51, 0xed, 0x3a, 0xff, 0xca, 0x0d, 0x4d, 0xf9, 0x6b, 0x30, 0x13,
+	0xd1, 0x98, 0xf2, 0x54, 0x87, 0x19, 0x11, 0x56, 0x10, 0x53, 0xe6, 0x34, 0x42, 0x5f, 0x0a, 0x20,
+	0x59, 0x82, 0x49, 0x34, 0x20, 0xcf, 0xc5, 0x12, 0x61, 0xd4, 0x9c, 0x60, 0x3f, 0x3b, 0x6e, 0xe3,
+	0x8f, 0xc0, 0x38, 0x4d, 0xc3, 0x82, 0x4b, 0xd1, 0xc9, 0xde, 0xe3, 0x77, 0x0b, 0x77, 0x46, 0xdb,
+	0xc6, 0xdc, 0xa6, 0x30, 0xd1, 0xfa, 0x4d, 0xfa, 0xdb, 0x31, 0x98, 0xde, 0x91, 0xf5, 0xc1, 0x77,
+	0xe2, 0x0e, 0x6d, 0x41, 0x55, 0x96, 0x5c, 0x28, 0x67, 0x1c, 0xe5, 0xb4, 0xb2, 0x39, 0x5d, 0x2a,
+	0x80, 0x93, 0xa2, 0x8c, 0x4a, 0x92, 0xfe, 0x20, 0x14, 0x16, 0xd4, 0x37, 0xc8, 0xd4, 0x1b, 0xe5,
+	0x4d, 0xa0, 0xbc, 0xbb, 0x67, 0xeb, 0x25, 0x4f, 0x55, 0x24, 0xe5, 0x28, 0x7e, 0xee, 0x78, 0x10,
+	0xa8, 0xdf, 0xf8, 0xc9, 0xec, 0x8d, 0x67, 0xc5, 0x94, 0x4c, 0x63, 0x65, 0x39, 0xc6, 0xef, 0xaa,
+	0xea, 0x58, 0x88, 0x1a, 0x83, 0xa5, 0x7d, 0xea, 0xc6, 0xf3, 0xac, 0x64, 0x92, 0x8a, 0xdb, 0xae,
+	0x59, 0x15, 0xe8, 0x56, 0x45, 0x36, 0x61, 0xf6, 0xc8, 0x8b, 0xbd, 0x5d, 0xcf, 0x67, 0xd5, 0x3b,
+	0xe6, 0x49, 0x95, 0xa1, 0x9e, 0x7f, 0x26, 0x65, 0xc1, 0xc4, 0xf4, 0x3f, 0xc6, 0xa0, 0x26, 0x23,
+	0xd5, 0x77, 0xc6, 0x40, 0xda, 0x30, 0x97, 0xd8, 0xd1, 0x3e, 0x4d, 0xac, 0x8c, 0x9a, 0xe3, 0xb8,
+	0x50, 0x9d, 0xa3, 0x9e, 0x6b, 0xca, 0xb2, 0x7c, 0x97, 0xd3, 0xeb, 0x3a, 0x4f, 0x20, 0x79, 0x8d,
+	0x63, 0x5e, 0xa6, 0x9a, 0xb7, 0x60, 0x5a, 0x50, 0x8b, 0x0f, 0x98, 0xe4, 0x9f, 0xcf, 0x81, 0x26,
+	0x7e, 0x46, 0xb6, 0x8c, 0x9e, 0xca, 0x97, 0xd1, 0xeb, 0xd0, 0x10, 0x22, 0x9c, 0x03, 0xcf, 0x77,
+	0xd3, 0x65, 0xc3, 0xc0, 0x3f, 0xc1, 0x03, 0x9e, 0x32, 0x97, 0x38, 0xc5, 0x26, 0x23, 0x90, 0xab,
+	0x7f, 0x12, 0xf8, 0x27, 0xf9, 0xea, 0x07, 0x06, 0xaa, 0x1f, 0xcd, 0xe2, 0x2a, 0x59, 0x8b, 0xd3,
+	0x6c, 0xa5, 0x3a, 0xcc, 0x56, 0xa6, 0xcf, 0x6b, 0x2b, 0xe4, 0x26, 0xd4, 0x23, 0xea, 0x84, 0x91,
+	0x6b, 0xa5, 0x08, 0xe1, 0x09, 0x6b, 0x1c, 0xf1, 0x99, 0x82, 0xb7, 0xfa, 0x40, 0x9e, 0xf1, 0x7e,
+	0x20, 0xf7, 0xa4, 0x26, 0xab, 0x62, 0xc8, 0x45, 0x28, 0x0b, 0x97, 0xab, 0xcc, 0x6a, 0x8a, 0x03,
+	0xf8, 0xc6, 0xef, 0xd2, 0x7d, 0x2f, 0xb0, 0x82, 0xd0, 0xd5, 0x0a, 0xa0, 0x0a, 0x02, 0x9f, 0x87,
+	0x2e, 0xfb, 0xf6, 0x26, 0x54, 0x68, 0xe0, 0x2a, 0x8a, 0x51, 0xde, 0x59, 0xa3, 0x81, 0xcb, 0xf1,
+	0xad, 0xbf, 0x2b, 0xc1, 0x74, 0x66, 0x5d, 0xdc, 0x93, 0x88, 0x6a, 0x76, 0x3c, 0xc1, 0x7e, 0x76,
+	0xdc, 0xac, 0x2e, 0x23, 0x39, 0x5d, 0xfe, 0x00, 0xca, 0x76, 0xe0, 0x50, 0x26, 0x28, 0x36, 0x46,
+	0x31, 0x44, 0xad, 0xbf, 0x76, 0x88, 0x1a, 0xfc, 0x70, 0x33, 0x95, 0xd6, 0xfa, 0x65, 0x09, 0x66,
+	0x05, 0xc5, 0x0e, 0xd3, 0x84, 0xdd, 0xb8, 0x97, 0x50, 0x91, 0xba, 0xb0, 0x98, 0x58, 0xc2, 0xb3,
+	0x79, 0xf0, 0x86, 0x0b, 0x82, 0xf8, 0x0a, 0x26, 0xf8, 0x7d, 0x28, 0xef, 0x85, 0xd1, 0x21, 0x3f,
+	0xf2, 0xe1, 0x89, 0xe1, 0x14, 0x23, 0xc6, 0xc3, 0x26, 0x30, 0x86, 0xaa, 0xf0, 0xdb, 0x8b, 0x7f,
+	0xb7, 0xfe, 0xb9, 0x04, 0x65, 0x0c, 0x25, 0x43, 0x7a, 0xb9, 0xd9, 0xee, 0xe7, 0x48, 0xbe, 0xfb,
+	0xb9, 0x0e, 0x15, 0xec, 0xa4, 0x08, 0x43, 0x1c, 0x1d, 0x5e, 0x22, 0x72, 0x72, 0xd4, 0x6b, 0x05,
+	0x2a, 0x7a, 0x03, 0x8c, 0x57, 0xb9, 0x78, 0x19, 0x45, 0xef, 0x6b, 0x19, 0xa6, 0x78, 0x61, 0xa4,
+	0x3c, 0xc2, 0x24, 0xfe, 0xee, 0xb8, 0xad, 0x2f, 0x47, 0x60, 0xea, 0xff, 0xc3, 0xc9, 0xe5, 0x6e,
+	0xf0, 0xd8, 0xc0, 0x0d, 0x5e, 0x87, 0x8a, 0x13, 0x51, 0x55, 0x24, 0x8f, 0x0f, 0xdf, 0x01, 0x4e,
+	0x8e, 0x3b, 0x90, 0xdb, 0xbe, 0x89, 0xf3, 0x6c, 0x5f, 0x2b, 0x86, 0xfa, 0x63, 0xdf, 0x0f, 0x1d,
+	0x3b, 0xa1, 0xae, 0xda, 0x8a, 0x2d, 0x18, 0x73, 0xed, 0xc4, 0x16, 0x66, 0x77, 0xf7, 0xb5, 0xcd,
+	0x4e, 0x0a, 0x30, 0x91, 0x5d, 0xf7, 0x3e, 0x53, 0xba, 0xf7, 0x69, 0x7d, 0x33, 0x02, 0xd3, 0x3b,
+	0xd2, 0x39, 0xbe, 0xee, 0xe6, 0x13, 0x18, 0xc3, 0x31, 0x04, 0xdf, 0x75, 0xfc, 0x9b, 0x3c, 0xd6,
+	0xa3, 0xc7, 0x28, 0x46, 0x8f, 0xab, 0xa7, 0xa5, 0x05, 0x72, 0xbd, 0x5c, 0xec, 0x78, 0x08, 0x63,
+	0x87, 0x5e, 0xe0, 0x8a, 0xa4, 0x62, 0x28, 0xf7, 0x87, 0x5e, 0xe0, 0x9a, 0xc8, 0xc1, 0xfc, 0x45,
+	0x5a, 0x55, 0xf2, 0xdc, 0x7d, 0xca, 0x96, 0x15, 0x71, 0xee, 0x50, 0x26, 0xcf, 0x65, 0xd3, 0x4f,
+	0xa0, 0x86, 0xb9, 0xb1, 0xde, 0x38, 0x19, 0xde, 0xf2, 0x98, 0x61, 0x3c, 0x5a, 0x8f, 0xe9, 0xcf,
+	0x47, 0x00, 0xb6, 0xbd, 0xfd, 0xc0, 0xf6, 0x87, 0x8f, 0x5a, 0x78, 0x27, 0x36, 0x39, 0x75, 0xd4,
+	0xa2, 0xf0, 0x99, 0x51, 0x4b, 0x76, 0x18, 0x30, 0x9a, 0x1f, 0x06, 0xc8, 0x13, 0x1b, 0xd3, 0x4e,
+	0xec, 0x01, 0x8c, 0x7b, 0x41, 0xaf, 0x9f, 0x08, 0x1b, 0x1f, 0xde, 0x98, 0xe3, 0xe4, 0x4c, 0x7b,
+	0x27, 0x0c, 0x92, 0x28, 0xf4, 0x45, 0x9c, 0x96, 0x3f, 0x99, 0xe9, 0xa4, 0xda, 0xa7, 0x05, 0x92,
+	0x82, 0x75, 0xdc, 0xd6, 0x3f, 0x95, 0xa0, 0x2e, 0x1a, 0xe7, 0x9b, 0xd8, 0x45, 0xff, 0x6d, 0x6d,
+	0x48, 0x61, 0xff, 0x9e, 0xef, 0xcb, 0x40, 0xff, 0x3e, 0xaf, 0xf7, 0xd8, 0xa0, 0xde, 0xff, 0x53,
+	0x82, 0x45, 0x99, 0x0a, 0x6c, 0x7d, 0x41, 0x9d, 0x3e, 0xcb, 0xe7, 0x99, 0x5b, 0xa3, 0xb8, 0x12,
+	0xf7, 0x18, 0xda, 0x4a, 0x25, 0xb1, 0x12, 0x22, 0xd2, 0x95, 0x52, 0xaf, 0x34, 0xa2, 0x7b, 0xa5,
+	0x0f, 0x60, 0x9c, 0x39, 0x4d, 0x79, 0x71, 0xee, 0xbf, 0x5e, 0xfe, 0x9b, 0xd5, 0xc3, 0xe4, 0x22,
+	0xc8, 0x53, 0x98, 0xd0, 0x1c, 0xf0, 0xcc, 0xbd, 0xf6, 0x29, 0xf7, 0xa8, 0x50, 0x4a, 0x3f, 0x36,
+	0x05, 0x77, 0xeb, 0xdf, 0x97, 0x61, 0x61, 0x80, 0xa6, 0xd0, 0x43, 0xfc, 0x70, 0xa8, 0x7b, 0xfe,
+	0xd1, 0x80, 0x7b, 0x6e, 0xc3, 0x5c, 0xcf, 0x8e, 0xd8, 0x71, 0x16, 0x38, 0x9b, 0x3a, 0x47, 0xe5,
+	0xf2, 0x44, 0x41, 0x3f, 0xe8, 0xf6, 0x6b, 0x1c, 0x93, 0xcd, 0x13, 0x05, 0x75, 0x26, 0x06, 0x54,
+	0x38, 0x90, 0xe7, 0x89, 0xc3, 0x0f, 0x9d, 0x7c, 0x1f, 0x96, 0x9d, 0xb0, 0xdb, 0xf3, 0x29, 0x96,
+	0xc4, 0x39, 0xeb, 0xe3, 0x3d, 0x84, 0xc5, 0x94, 0x20, 0x63, 0x7e, 0x37, 0xa0, 0x96, 0x67, 0xc5,
+	0xdb, 0x52, 0x35, 0x67, 0x73, 0x1c, 0xe4, 0x51, 0xc1, 0x2a, 0x6a, 0x9e, 0xc8, 0x13, 0xdc, 0xa5,
+	0x1c, 0x8f, 0x1a, 0x29, 0x0e, 0x49, 0x76, 0x6f, 0x01, 0x51, 0xdb, 0xc5, 0x1c, 0x33, 0x9f, 0x1e,
+	0x97, 0xf9, 0xae, 0x49, 0x0c, 0xf3, 0xbd, 0x38, 0x42, 0xfe, 0x10, 0x5a, 0x8a, 0x9a, 0xca, 0x13,
+	0x1f, 0x18, 0xb1, 0xf1, 0x86, 0xc3, 0xca, 0x71, 0xde, 0x34, 0x72, 0xa3, 0xb6, 0xdf, 0x83, 0x4b,
+	0x4a, 0x18, 0x3b, 0x84, 0xbc, 0x98, 0x0a, 0x8a, 0x59, 0x96, 0x34, 0x66, 0x3f, 0x2f, 0xe0, 0x31,
+	0x5c, 0x4e, 0x75, 0xc7, 0xc8, 0x52, 0x38, 0xbb, 0x6c, 0xa8, 0xcf, 0x60, 0x61, 0x24, 0x2b, 0x42,
+	0xce, 0x72, 0x55, 0xb3, 0x84, 0xd7, 0xfe, 0x7c, 0x96, 0x2b, 0x3b, 0x24, 0xd7, 0x61, 0xd6, 0xe9,
+	0x47, 0x68, 0x2c, 0x92, 0xac, 0x86, 0x64, 0x33, 0x02, 0x2c, 0x09, 0x1d, 0xa8, 0x65, 0x5a, 0x99,
+	0x2c, 0x2c, 0xd7, 0xd1, 0x75, 0x3e, 0x7c, 0x93, 0x0e, 0xc9, 0x13, 0x3b, 0xb1, 0xcd, 0xd9, 0x28,
+	0x0b, 0x20, 0x37, 0x81, 0x60, 0xbc, 0xe1, 0x66, 0x20, 0x63, 0xf6, 0x1c, 0x2f, 0x4d, 0x19, 0x06,
+	0xcf, 0x7f, 0x87, 0x97, 0x0e, 0xdf, 0x83, 0x39, 0x3e, 0x36, 0xca, 0x36, 0xaf, 0xe6, 0xf9, 0xb4,
+	0x80, 0xa1, 0x9e, 0xea, 0x0d, 0xac, 0x3b, 0x80, 0xa3, 0x15, 0xab, 0x17, 0x85, 0x0e, 0x8d, 0x63,
+	0x35, 0xe1, 0x5e, 0xe0, 0xb3, 0x72, 0x86, 0x7b, 0x21, 0x51, 0xdc, 0x34, 0xd7, 0xc4, 0xcc, 0x51,
+	0x9f, 0xa9, 0x2d, 0xf2, 0xcd, 0x89, 0xe5, 0xa0, 0x98, 0x4f, 0xd2, 0xde, 0x15, 0x63, 0x1f, 0x2d,
+	0x4e, 0x0a, 0xfa, 0x25, 0x3e, 0xec, 0xc8, 0x46, 0x44, 0xce, 0x74, 0x03, 0x6a, 0x2e, 0x75, 0xbc,
+	0x58, 0x6f, 0xfc, 0x1b, 0xfc, 0x53, 0x25, 0x5c, 0x6e, 0xfe, 0x1d, 0x98, 0x57, 0xa4, 0x7a, 0x02,
+	0xb7, 0xcc, 0x75, 0x97, 0xb8, 0xed, 0x34, 0x91, 0x6b, 0xc3, 0x5c, 0xca, 0x91, 0xa6, 0xbc, 0x7c,
+	0x24, 0x58, 0x57, 0x0c, 0x2a, 0xf5, 0xd5, 0x95, 0x11, 0xa6, 0x86, 0x23, 0xc0, 0xf1, 0x54, 0x19,
+	0x61, 0x5e, 0x19, 0x52, 0xd9, 0x3d, 0xb8, 0x94, 0xd5, 0x5b, 0x76, 0x0f, 0x7e, 0x1f, 0x56, 0x07,
+	0xb4, 0x50, 0xef, 0x76, 0xc4, 0x0e, 0x5d, 0x46, 0xd6, 0xcb, 0x39, 0x95, 0x54, 0x36, 0xc1, 0xf7,
+	0xea, 0x43, 0x68, 0x0d, 0x6c, 0xc0, 0xa0, 0xa8, 0x26, 0x8a, 0x5a, 0xc9, 0x6f, 0x47, 0x5e, 0x58,
+	0xd1, 0x1c, 0x7c, 0xa5, 0x78, 0x0e, 0xfe, 0x73, 0xb8, 0xa9, 0xd6, 0x0d, 0x23, 0x6f, 0xdf, 0x0b,
+	0x6c, 0xff, 0x0c, 0x05, 0xf8, 0x40, 0xf0, 0xba, 0x64, 0xf9, 0x44, 0x70, 0x9c, 0xa6, 0x88, 0x7e,
+	0x48, 0x5a, 0xf4, 0x6c, 0xf1, 0x30, 0x20, 0x51, 0x99, 0x49, 0xfb, 0x60, 0x54, 0x7f, 0xab, 0x38,
+	0xaa, 0xbf, 0x03, 0xf5, 0x38, 0xf1, 0x9c, 0xc3, 0x13, 0x4b, 0x73, 0x91, 0x57, 0xe5, 0xc4, 0x9c,
+	0x21, 0x54, 0x2a, 0x49, 0x9e, 0xc2, 0xaa, 0xa0, 0x3d, 0xf5, 0xcd, 0x84, 0x71, 0x8d, 0x8f, 0xa4,
+	0x38, 0xdd, 0x76, 0xe1, 0x8b, 0x09, 0xe6, 0x71, 0xf8, 0xf8, 0x55, 0x9a, 0xc5, 0xdb, 0xdc, 0xe3,
+	0x20, 0x50, 0xda, 0xc4, 0xf0, 0xa1, 0xfb, 0xf5, 0xdf, 0xc4, 0xd0, 0x7d, 0xed, 0xdb, 0x0c, 0xdd,
+	0x6f, 0x9c, 0x31, 0x74, 0x3f, 0x73, 0x6a, 0xfe, 0xce, 0xd9, 0x53, 0xf3, 0x21, 0x03, 0xfb, 0x9b,
+	0x43, 0x06, 0xf6, 0xaf, 0x31, 0x74, 0xbf, 0x35, 0x7c, 0xe8, 0x5e, 0xf4, 0x3e, 0xe2, 0x7b, 0x85,
+	0xef, 0x23, 0xde, 0x82, 0x69, 0x27, 0xd2, 0x6e, 0x9c, 0xd1, 0x46, 0xfb, 0xa9, 0x32, 0xa0, 0x34,
+	0x81, 0xd3, 0x3a, 0xfa, 0xb7, 0x4f, 0xeb, 0xe8, 0xdf, 0x02, 0x22, 0x72, 0x09, 0xbd, 0xc5, 0x7d,
+	0x07, 0xb3, 0x83, 0x1a, 0x62, 0xf4, 0x0e, 0xf7, 0x15, 0xa8, 0xc6, 0x58, 0x3a, 0x88, 0x17, 0x5d,
+	0x77, 0xc5, 0x48, 0x01, 0x61, 0xf8, 0x96, 0x8b, 0x91, 0xa8, 0xb7, 0x5f, 0xde, 0x2f, 0xa8, 0x71,
+	0x8f, 0x93, 0xc8, 0x47, 0x5f, 0xde, 0x2f, 0x28, 0x3b, 0x69, 0xc7, 0x67, 0x27, 0x60, 0xf9, 0xde,
+	0x6e, 0x64, 0x47, 0x27, 0x4a, 0xcd, 0x77, 0xf9, 0x8b, 0x25, 0x8e, 0xfd, 0x88, 0x23, 0xa5, 0xa6,
+	0x29, 0xd7, 0x1e, 0xb5, 0x93, 0xbe, 0xf6, 0x71, 0xf7, 0x75, 0xae, 0xa7, 0x1c, 0x29, 0xb9, 0x56,
+	0xa0, 0x22, 0xb8, 0xbc, 0x6e, 0xcf, 0x37, 0xde, 0xe3, 0xc9, 0x1f, 0x07, 0x75, 0xba, 0x3d, 0x9f,
+	0xdd, 0x4c, 0xbb, 0x9f, 0x84, 0x16, 0xef, 0xdc, 0xf7, 0x42, 0x2f, 0x48, 0x62, 0xe3, 0x01, 0xcf,
+	0x8e, 0x18, 0xc2, 0x64, 0xf0, 0x17, 0x08, 0x26, 0xeb, 0xd0, 0x18, 0xa0, 0x4d, 0xd3, 0xa3, 0xf7,
+	0x79, 0x7a, 0x94, 0x63, 0x52, 0xe9, 0xd1, 0x1f, 0x97, 0xa0, 0x1e, 0x53, 0x3b, 0x72, 0x0e, 0x98,
+	0x65, 0x47, 0xde, 0x6e, 0x3f, 0xa1, 0xb1, 0xf1, 0x10, 0x7b, 0x46, 0x3b, 0xaf, 0x1d, 0xb4, 0x0b,
+	0xb3, 0xe0, 0xf6, 0x36, 0xca, 0x7d, 0xac, 0xc4, 0xf2, 0xa9, 0x46, 0x2d, 0xce, 0x81, 0xc9, 0xcf,
+	0x61, 0xac, 0x4b, 0xbb, 0xa1, 0xf1, 0x7d, 0x5c, 0xf5, 0xd9, 0xb7, 0x5c, 0xf5, 0x63, 0xda, 0x15,
+	0xf3, 0x13, 0x94, 0x4a, 0x6e, 0x42, 0x5d, 0x1c, 0x89, 0xc5, 0x8f, 0xdb, 0xa3, 0xb1, 0xf1, 0x88,
+	0x9b, 0x92, 0x40, 0x3c, 0x93, 0x70, 0xf2, 0x03, 0x68, 0x0c, 0x10, 0xa7, 0x7b, 0xb9, 0x8e, 0x7b,
+	0x69, 0xe4, 0xb9, 0xe4, 0x66, 0x36, 0x5c, 0x58, 0x28, 0xfc, 0xe6, 0x82, 0x39, 0xc9, 0x7b, 0xd9,
+	0x39, 0xc9, 0xca, 0x90, 0xd2, 0x52, 0x1f, 0x54, 0xfe, 0x14, 0xca, 0xea, 0x1b, 0x7f, 0xa3, 0x92,
+	0x5b, 0x5f, 0x96, 0x60, 0x6a, 0xf3, 0x80, 0x3a, 0x87, 0x71, 0xbf, 0x9b, 0xaf, 0x38, 0xc7, 0xd3,
+	0x8a, 0xf3, 0x09, 0x4c, 0xec, 0xf9, 0xf6, 0x51, 0x18, 0xe1, 0x12, 0x33, 0xf7, 0x6e, 0x9d, 0x5d,
+	0x8c, 0x49, 0x89, 0x4f, 0x91, 0xc7, 0x14, 0xbc, 0xe9, 0xf8, 0x94, 0x3f, 0x78, 0xe4, 0x3f, 0x5a,
+	0x7f, 0x3d, 0x0e, 0x04, 0xbb, 0xca, 0xd9, 0x82, 0xea, 0xb7, 0xd3, 0x0f, 0xd0, 0x92, 0x9e, 0xd1,
+	0x7c, 0x9f, 0xef, 0x3a, 0xcc, 0xe6, 0xe4, 0x62, 0xfd, 0x53, 0x35, 0x67, 0xb2, 0xe2, 0xc8, 0xc3,
+	0x41, 0x05, 0x94, 0xc1, 0xf0, 0x16, 0xde, 0x62, 0x96, 0x43, 0xdd, 0xbd, 0x36, 0xcc, 0x49, 0x0d,
+	0x06, 0x5b, 0xfb, 0x75, 0x81, 0xd2, 0x6a, 0xb6, 0xab, 0x30, 0x23, 0xe9, 0x33, 0xcd, 0x7d, 0xf9,
+	0xf2, 0x92, 0x57, 0x6d, 0x03, 0xcf, 0x33, 0xa7, 0xce, 0xf5, 0x3c, 0xb3, 0x7c, 0xc6, 0xf3, 0xcc,
+	0xc2, 0x3a, 0x1e, 0x8a, 0xeb, 0xf8, 0x4b, 0x50, 0x56, 0x75, 0xab, 0x7c, 0x7a, 0xa9, 0x00, 0xa7,
+	0x94, 0x5d, 0xd5, 0x53, 0xca, 0xae, 0x9f, 0xaa, 0x52, 0x98, 0x3f, 0x89, 0x14, 0x01, 0x69, 0x1a,
+	0xad, 0x6f, 0xed, 0x94, 0xea, 0xfd, 0x05, 0x72, 0xe0, 0xfb, 0x48, 0x1e, 0xaa, 0x64, 0xd1, 0xac,
+	0x81, 0x06, 0x4a, 0xdc, 0x99, 0xc1, 0xbe, 0xc6, 0x7f, 0x8d, 0xc2, 0xac, 0xaa, 0xb3, 0xf9, 0x5b,
+	0x2b, 0xf2, 0x81, 0xe8, 0x2f, 0x9f, 0xb7, 0xd5, 0x9d, 0xd6, 0xeb, 0xd8, 0x78, 0x64, 0x32, 0xc8,
+	0x0b, 0x98, 0x70, 0xc2, 0x60, 0xcf, 0xdb, 0x17, 0x17, 0xf6, 0xe1, 0xf9, 0xa5, 0x6d, 0x22, 0xbf,
+	0x29, 0xe4, 0x90, 0x08, 0x88, 0x5e, 0x86, 0x09, 0xe9, 0xbc, 0x53, 0xbd, 0x79, 0x7e, 0xe9, 0x5a,
+	0x45, 0x26, 0x16, 0xaa, 0x47, 0x79, 0x10, 0xb9, 0x06, 0x33, 0x7c, 0x9d, 0xdc, 0xfb, 0xa4, 0x69,
+	0x0e, 0x95, 0x81, 0x6f, 0x03, 0x2e, 0xef, 0xd9, 0x9e, 0x1f, 0x1e, 0xd1, 0xa8, 0xf8, 0x55, 0x13,
+	0x9f, 0x09, 0x5d, 0x94, 0x44, 0x45, 0x8f, 0x9a, 0x6e, 0x40, 0x4d, 0xc9, 0x90, 0x6c, 0x7c, 0x60,
+	0x34, 0x2b, 0xe1, 0x92, 0xf4, 0x1d, 0xa8, 0x2b, 0x52, 0x1a, 0xb8, 0xe9, 0xec, 0x48, 0xa3, 0xdd,
+	0x0a, 0x30, 0xe5, 0x6e, 0xfd, 0x72, 0x04, 0xa6, 0x33, 0xe7, 0x43, 0x66, 0x60, 0x44, 0x35, 0x5c,
+	0x46, 0x3c, 0x97, 0xac, 0xcb, 0x1e, 0x14, 0x77, 0x7b, 0xd7, 0x4e, 0x31, 0x3c, 0x25, 0x24, 0xd3,
+	0x74, 0x92, 0xfd, 0xc5, 0x51, 0xad, 0xbf, 0xb8, 0x0a, 0x15, 0x97, 0xc6, 0x4e, 0xe4, 0xf5, 0xd8,
+	0xf7, 0x89, 0xd6, 0xa3, 0x0e, 0x4a, 0x9f, 0xcd, 0x8d, 0xeb, 0xcf, 0xe6, 0x76, 0x44, 0xcb, 0x7b,
+	0x02, 0x03, 0xe6, 0x8f, 0xdf, 0xcc, 0xfc, 0xda, 0xac, 0x9a, 0x16, 0x81, 0x92, 0x49, 0x6b, 0xbc,
+	0x0f, 0x65, 0x05, 0x1a, 0xf6, 0xdc, 0xa5, 0xac, 0x87, 0x8d, 0x03, 0x68, 0x9c, 0x6e, 0x2c, 0xcc,
+	0xcb, 0xe1, 0x93, 0x6c, 0x6a, 0x15, 0x3c, 0xd0, 0xaf, 0x73, 0xd4, 0xa6, 0xf6, 0x4c, 0xbf, 0x01,
+	0x53, 0x82, 0x30, 0x36, 0x46, 0x30, 0x53, 0x55, 0xbf, 0x5b, 0xff, 0xab, 0xdf, 0xc5, 0xd4, 0xf2,
+	0x22, 0x9a, 0xd0, 0x40, 0xb4, 0x1c, 0x4e, 0x62, 0x11, 0xae, 0xa6, 0x15, 0xf4, 0x89, 0x7d, 0x82,
+	0x8f, 0xc5, 0x69, 0xd7, 0x4b, 0xac, 0x2e, 0x4d, 0x22, 0xcf, 0xc1, 0x8f, 0x98, 0x32, 0x81, 0x81,
+	0x3e, 0x46, 0x08, 0x73, 0xf8, 0x2c, 0x74, 0x7b, 0xac, 0x40, 0xd8, 0xed, 0x3b, 0x87, 0x34, 0x11,
+	0x67, 0x35, 0x23, 0xc1, 0x1b, 0x08, 0x25, 0x1d, 0xa8, 0xee, 0xda, 0xae, 0xb5, 0xeb, 0x05, 0x36,
+	0xe6, 0x12, 0x35, 0xbc, 0x58, 0x6f, 0x67, 0xad, 0x21, 0xfd, 0x37, 0x8f, 0xa3, 0xbb, 0xed, 0x0d,
+	0xdb, 0xdd, 0x10, 0xd4, 0x66, 0x65, 0x37, 0xfd, 0x41, 0x7e, 0x06, 0x8b, 0x32, 0x2d, 0x55, 0x6b,
+	0x73, 0x13, 0x23, 0x67, 0x76, 0xf8, 0x1f, 0x0b, 0x62, 0x6e, 0x61, 0xf3, 0x42, 0x46, 0x06, 0x4a,
+	0xee, 0xc0, 0xfc, 0x80, 0xec, 0x7e, 0xe4, 0x61, 0xa7, 0xa4, 0x6c, 0x92, 0x1c, 0xcf, 0xa7, 0x91,
+	0x47, 0xfe, 0x10, 0x96, 0xb5, 0x39, 0x6b, 0x4e, 0xa1, 0xf9, 0x73, 0x28, 0xb4, 0x94, 0x8a, 0xc9,
+	0xea, 0xf4, 0x00, 0x96, 0x8a, 0x56, 0x60, 0x6a, 0xf1, 0x87, 0xda, 0x0b, 0x83, 0x9c, 0x9f, 0x46,
+	0x5e, 0xeb, 0x5f, 0x46, 0x60, 0x36, 0xd7, 0x18, 0x52, 0xad, 0x9d, 0xe3, 0xc8, 0x4b, 0x68, 0xda,
+	0xda, 0x29, 0xa5, 0xad, 0x9d, 0x97, 0x0c, 0x23, 0x5b, 0x3b, 0x7f, 0x7a, 0xea, 0x1b, 0x9e, 0x11,
+	0xbc, 0x45, 0x3f, 0x79, 0xd3, 0x0e, 0xd5, 0xf9, 0xde, 0xef, 0xfc, 0x6e, 0x9f, 0xd3, 0xfc, 0x7d,
+	0x29, 0xf3, 0x30, 0x4d, 0xb8, 0xc9, 0x98, 0xfc, 0xb8, 0xa8, 0x0d, 0x58, 0xb9, 0x77, 0x71, 0x60,
+	0x80, 0xd3, 0x09, 0x92, 0x07, 0xf7, 0x3f, 0x63, 0xf2, 0x72, 0x3d, 0xc2, 0x8e, 0xe8, 0xca, 0xf1,
+	0xd3, 0xd0, 0xdb, 0x84, 0x43, 0xc4, 0xa4, 0x27, 0x25, 0x44, 0x6d, 0x24, 0x5f, 0x7d, 0xdd, 0xbc,
+	0xf0, 0xab, 0xaf, 0x9b, 0x17, 0x7e, 0xfd, 0x75, 0xb3, 0xf4, 0xe5, 0xab, 0x66, 0xe9, 0x1f, 0x5e,
+	0x35, 0x4b, 0xff, 0xf6, 0xaa, 0x59, 0xfa, 0xea, 0x55, 0xb3, 0xf4, 0x9f, 0xaf, 0x9a, 0xa5, 0xff,
+	0x7e, 0xd5, 0xbc, 0xf0, 0xeb, 0x57, 0xcd, 0xd2, 0xdf, 0x7c, 0xd3, 0xbc, 0xf0, 0xd5, 0x37, 0xcd,
+	0x0b, 0xbf, 0xfa, 0xa6, 0x79, 0xe1, 0x67, 0x3f, 0xda, 0x0f, 0xd3, 0xcd, 0xf1, 0xc2, 0x21, 0xff,
+	0x61, 0xb6, 0x9e, 0x87, 0xed, 0x4e, 0xa0, 0x72, 0xef, 0xfe, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x16, 0xcc, 0x5b, 0xfc, 0xa4, 0x36, 0x00, 0x00,
 }
 
 func (this *ImmutableClusterMetadata) Equal(that interface{}) bool {
@@ -3248,7 +3258,7 @@ func (this *ActivityInfo) Equal(that interface{}) bool {
 	if !this.LastHeartbeatDetails.Equal(that1.LastHeartbeatDetails) {
 		return false
 	}
-	if !this.LastHeartbeatUpdatedTime.Equal(that1.LastHeartbeatUpdatedTime) {
+	if !this.LastHeartbeatUpdateTime.Equal(that1.LastHeartbeatUpdateTime) {
 		return false
 	}
 	return true
@@ -3290,10 +3300,10 @@ func (this *ShardInfo) Equal(that interface{}) bool {
 	if this.StolenSinceRenew != that1.StolenSinceRenew {
 		return false
 	}
-	if !this.UpdatedAt.Equal(that1.UpdatedAt) {
+	if !this.UpdateTime.Equal(that1.UpdateTime) {
 		return false
 	}
-	if !this.TimerAckLevel.Equal(that1.TimerAckLevel) {
+	if !this.TimerAckLevelTime.Equal(that1.TimerAckLevelTime) {
 		return false
 	}
 	if this.NamespaceNotificationVersion != that1.NamespaceNotificationVersion {
@@ -3453,7 +3463,7 @@ func (this *TimerTaskInfo) Equal(that interface{}) bool {
 	if this.TaskId != that1.TaskId {
 		return false
 	}
-	if !this.VisibilityTimestamp.Equal(that1.VisibilityTimestamp) {
+	if !this.VisibilityTime.Equal(that1.VisibilityTime) {
 		return false
 	}
 	return true
@@ -3513,7 +3523,7 @@ func (this *TransferTaskInfo) Equal(that interface{}) bool {
 	if this.TaskId != that1.TaskId {
 		return false
 	}
-	if !this.VisibilityTimestamp.Equal(that1.VisibilityTimestamp) {
+	if !this.VisibilityTime.Equal(that1.VisibilityTime) {
 		return false
 	}
 	if this.RecordVisibility != that1.RecordVisibility {
@@ -3683,10 +3693,10 @@ func (this *TaskInfo) Equal(that interface{}) bool {
 	if this.ScheduleId != that1.ScheduleId {
 		return false
 	}
-	if !this.CreatedTime.Equal(that1.CreatedTime) {
+	if !this.CreateTime.Equal(that1.CreateTime) {
 		return false
 	}
-	if !this.Expiry.Equal(that1.Expiry) {
+	if !this.ExpiryTime.Equal(that1.ExpiryTime) {
 		return false
 	}
 	return true
@@ -3752,10 +3762,10 @@ func (this *TaskQueueInfo) Equal(that interface{}) bool {
 	if this.AckLevel != that1.AckLevel {
 		return false
 	}
-	if !this.Expiry.Equal(that1.Expiry) {
+	if !this.ExpiryTime.Equal(that1.ExpiryTime) {
 		return false
 	}
-	if !this.LastUpdated.Equal(that1.LastUpdated) {
+	if !this.LastUpdateTime.Equal(that1.LastUpdateTime) {
 		return false
 	}
 	return true
@@ -3950,7 +3960,7 @@ func (this *WorkflowExecutionInfo) Equal(that interface{}) bool {
 	if this.StartTimeNanos != that1.StartTimeNanos {
 		return false
 	}
-	if this.LastUpdatedTimeNanos != that1.LastUpdatedTimeNanos {
+	if this.LastUpdateTimeNanos != that1.LastUpdateTimeNanos {
 		return false
 	}
 	if this.DecisionVersion != that1.DecisionVersion {
@@ -4232,7 +4242,7 @@ func (this *NamespaceInfo) Equal(that interface{}) bool {
 	if this.Id != that1.Id {
 		return false
 	}
-	if this.Status != that1.Status {
+	if this.State != that1.State {
 		return false
 	}
 	if this.Name != that1.Name {
@@ -4317,13 +4327,13 @@ func (this *NamespaceConfig) Equal(that interface{}) bool {
 	if !this.BadBinaries.Equal(that1.BadBinaries) {
 		return false
 	}
-	if this.HistoryArchivalStatus != that1.HistoryArchivalStatus {
+	if this.HistoryArchivalState != that1.HistoryArchivalState {
 		return false
 	}
 	if this.HistoryArchivalUri != that1.HistoryArchivalUri {
 		return false
 	}
-	if this.VisibilityArchivalStatus != that1.VisibilityArchivalStatus {
+	if this.VisibilityArchivalState != that1.VisibilityArchivalState {
 		return false
 	}
 	if this.VisibilityArchivalUri != that1.VisibilityArchivalUri {
@@ -4444,8 +4454,8 @@ func (this *ActivityInfo) GoString() string {
 	if this.LastHeartbeatDetails != nil {
 		s = append(s, "LastHeartbeatDetails: "+fmt.Sprintf("%#v", this.LastHeartbeatDetails)+",\n")
 	}
-	if this.LastHeartbeatUpdatedTime != nil {
-		s = append(s, "LastHeartbeatUpdatedTime: "+fmt.Sprintf("%#v", this.LastHeartbeatUpdatedTime)+",\n")
+	if this.LastHeartbeatUpdateTime != nil {
+		s = append(s, "LastHeartbeatUpdateTime: "+fmt.Sprintf("%#v", this.LastHeartbeatUpdateTime)+",\n")
 	}
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -4462,11 +4472,11 @@ func (this *ShardInfo) GoString() string {
 	s = append(s, "ReplicationAckLevel: "+fmt.Sprintf("%#v", this.ReplicationAckLevel)+",\n")
 	s = append(s, "TransferAckLevel: "+fmt.Sprintf("%#v", this.TransferAckLevel)+",\n")
 	s = append(s, "StolenSinceRenew: "+fmt.Sprintf("%#v", this.StolenSinceRenew)+",\n")
-	if this.UpdatedAt != nil {
-		s = append(s, "UpdatedAt: "+fmt.Sprintf("%#v", this.UpdatedAt)+",\n")
+	if this.UpdateTime != nil {
+		s = append(s, "UpdateTime: "+fmt.Sprintf("%#v", this.UpdateTime)+",\n")
 	}
-	if this.TimerAckLevel != nil {
-		s = append(s, "TimerAckLevel: "+fmt.Sprintf("%#v", this.TimerAckLevel)+",\n")
+	if this.TimerAckLevelTime != nil {
+		s = append(s, "TimerAckLevelTime: "+fmt.Sprintf("%#v", this.TimerAckLevelTime)+",\n")
 	}
 	s = append(s, "NamespaceNotificationVersion: "+fmt.Sprintf("%#v", this.NamespaceNotificationVersion)+",\n")
 	keysForClusterTransferAckLevel := make([]string, 0, len(this.ClusterTransferAckLevel))
@@ -4576,8 +4586,8 @@ func (this *TimerTaskInfo) GoString() string {
 	s = append(s, "ScheduleAttempt: "+fmt.Sprintf("%#v", this.ScheduleAttempt)+",\n")
 	s = append(s, "EventId: "+fmt.Sprintf("%#v", this.EventId)+",\n")
 	s = append(s, "TaskId: "+fmt.Sprintf("%#v", this.TaskId)+",\n")
-	if this.VisibilityTimestamp != nil {
-		s = append(s, "VisibilityTimestamp: "+fmt.Sprintf("%#v", this.VisibilityTimestamp)+",\n")
+	if this.VisibilityTime != nil {
+		s = append(s, "VisibilityTime: "+fmt.Sprintf("%#v", this.VisibilityTime)+",\n")
 	}
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -4600,8 +4610,8 @@ func (this *TransferTaskInfo) GoString() string {
 	s = append(s, "ScheduleId: "+fmt.Sprintf("%#v", this.ScheduleId)+",\n")
 	s = append(s, "Version: "+fmt.Sprintf("%#v", this.Version)+",\n")
 	s = append(s, "TaskId: "+fmt.Sprintf("%#v", this.TaskId)+",\n")
-	if this.VisibilityTimestamp != nil {
-		s = append(s, "VisibilityTimestamp: "+fmt.Sprintf("%#v", this.VisibilityTimestamp)+",\n")
+	if this.VisibilityTime != nil {
+		s = append(s, "VisibilityTime: "+fmt.Sprintf("%#v", this.VisibilityTime)+",\n")
 	}
 	s = append(s, "RecordVisibility: "+fmt.Sprintf("%#v", this.RecordVisibility)+",\n")
 	s = append(s, "}")
@@ -4675,11 +4685,11 @@ func (this *TaskInfo) GoString() string {
 	s = append(s, "WorkflowId: "+fmt.Sprintf("%#v", this.WorkflowId)+",\n")
 	s = append(s, "RunId: "+fmt.Sprintf("%#v", this.RunId)+",\n")
 	s = append(s, "ScheduleId: "+fmt.Sprintf("%#v", this.ScheduleId)+",\n")
-	if this.CreatedTime != nil {
-		s = append(s, "CreatedTime: "+fmt.Sprintf("%#v", this.CreatedTime)+",\n")
+	if this.CreateTime != nil {
+		s = append(s, "CreateTime: "+fmt.Sprintf("%#v", this.CreateTime)+",\n")
 	}
-	if this.Expiry != nil {
-		s = append(s, "Expiry: "+fmt.Sprintf("%#v", this.Expiry)+",\n")
+	if this.ExpiryTime != nil {
+		s = append(s, "ExpiryTime: "+fmt.Sprintf("%#v", this.ExpiryTime)+",\n")
 	}
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -4708,11 +4718,11 @@ func (this *TaskQueueInfo) GoString() string {
 	s = append(s, "TaskType: "+fmt.Sprintf("%#v", this.TaskType)+",\n")
 	s = append(s, "Kind: "+fmt.Sprintf("%#v", this.Kind)+",\n")
 	s = append(s, "AckLevel: "+fmt.Sprintf("%#v", this.AckLevel)+",\n")
-	if this.Expiry != nil {
-		s = append(s, "Expiry: "+fmt.Sprintf("%#v", this.Expiry)+",\n")
+	if this.ExpiryTime != nil {
+		s = append(s, "ExpiryTime: "+fmt.Sprintf("%#v", this.ExpiryTime)+",\n")
 	}
-	if this.LastUpdated != nil {
-		s = append(s, "LastUpdated: "+fmt.Sprintf("%#v", this.LastUpdated)+",\n")
+	if this.LastUpdateTime != nil {
+		s = append(s, "LastUpdateTime: "+fmt.Sprintf("%#v", this.LastUpdateTime)+",\n")
 	}
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -4790,7 +4800,7 @@ func (this *WorkflowExecutionInfo) GoString() string {
 	s = append(s, "LastFirstEventId: "+fmt.Sprintf("%#v", this.LastFirstEventId)+",\n")
 	s = append(s, "LastProcessedEvent: "+fmt.Sprintf("%#v", this.LastProcessedEvent)+",\n")
 	s = append(s, "StartTimeNanos: "+fmt.Sprintf("%#v", this.StartTimeNanos)+",\n")
-	s = append(s, "LastUpdatedTimeNanos: "+fmt.Sprintf("%#v", this.LastUpdatedTimeNanos)+",\n")
+	s = append(s, "LastUpdateTimeNanos: "+fmt.Sprintf("%#v", this.LastUpdateTimeNanos)+",\n")
 	s = append(s, "DecisionVersion: "+fmt.Sprintf("%#v", this.DecisionVersion)+",\n")
 	s = append(s, "DecisionScheduleId: "+fmt.Sprintf("%#v", this.DecisionScheduleId)+",\n")
 	s = append(s, "DecisionStartedId: "+fmt.Sprintf("%#v", this.DecisionStartedId)+",\n")
@@ -4917,7 +4927,7 @@ func (this *NamespaceInfo) GoString() string {
 	s := make([]string, 0, 10)
 	s = append(s, "&persistenceblobs.NamespaceInfo{")
 	s = append(s, "Id: "+fmt.Sprintf("%#v", this.Id)+",\n")
-	s = append(s, "Status: "+fmt.Sprintf("%#v", this.Status)+",\n")
+	s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n")
 	s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n")
 	s = append(s, "Description: "+fmt.Sprintf("%#v", this.Description)+",\n")
 	s = append(s, "Owner: "+fmt.Sprintf("%#v", this.Owner)+",\n")
@@ -4960,9 +4970,9 @@ func (this *NamespaceConfig) GoString() string {
 	if this.BadBinaries != nil {
 		s = append(s, "BadBinaries: "+fmt.Sprintf("%#v", this.BadBinaries)+",\n")
 	}
-	s = append(s, "HistoryArchivalStatus: "+fmt.Sprintf("%#v", this.HistoryArchivalStatus)+",\n")
+	s = append(s, "HistoryArchivalState: "+fmt.Sprintf("%#v", this.HistoryArchivalState)+",\n")
 	s = append(s, "HistoryArchivalUri: "+fmt.Sprintf("%#v", this.HistoryArchivalUri)+",\n")
-	s = append(s, "VisibilityArchivalStatus: "+fmt.Sprintf("%#v", this.VisibilityArchivalStatus)+",\n")
+	s = append(s, "VisibilityArchivalState: "+fmt.Sprintf("%#v", this.VisibilityArchivalState)+",\n")
 	s = append(s, "VisibilityArchivalUri: "+fmt.Sprintf("%#v", this.VisibilityArchivalUri)+",\n")
 	s = append(s, "}")
 	return strings.Join(s, "")
@@ -5068,9 +5078,9 @@ func (m *ActivityInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.LastHeartbeatUpdatedTime != nil {
+	if m.LastHeartbeatUpdateTime != nil {
 		{
-			size, err := m.LastHeartbeatUpdatedTime.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.LastHeartbeatUpdateTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -5437,9 +5447,9 @@ func (m *ShardInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x48
 	}
-	if m.TimerAckLevel != nil {
+	if m.TimerAckLevelTime != nil {
 		{
-			size, err := m.TimerAckLevel.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.TimerAckLevelTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -5449,9 +5459,9 @@ func (m *ShardInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x42
 	}
-	if m.UpdatedAt != nil {
+	if m.UpdateTime != nil {
 		{
-			size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.UpdateTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -5650,9 +5660,9 @@ func (m *TimerTaskInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.VisibilityTimestamp != nil {
+	if m.VisibilityTime != nil {
 		{
-			size, err := m.VisibilityTimestamp.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.VisibilityTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -5751,9 +5761,9 @@ func (m *TransferTaskInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x70
 	}
-	if m.VisibilityTimestamp != nil {
+	if m.VisibilityTime != nil {
 		{
-			size, err := m.VisibilityTimestamp.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.VisibilityTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -6067,9 +6077,9 @@ func (m *TaskInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.Expiry != nil {
+	if m.ExpiryTime != nil {
 		{
-			size, err := m.Expiry.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.ExpiryTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -6079,9 +6089,9 @@ func (m *TaskInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x32
 	}
-	if m.CreatedTime != nil {
+	if m.CreateTime != nil {
 		{
-			size, err := m.CreatedTime.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.CreateTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -6180,9 +6190,9 @@ func (m *TaskQueueInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.LastUpdated != nil {
+	if m.LastUpdateTime != nil {
 		{
-			size, err := m.LastUpdated.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.LastUpdateTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -6192,9 +6202,9 @@ func (m *TaskQueueInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x42
 	}
-	if m.Expiry != nil {
+	if m.ExpiryTime != nil {
 		{
-			size, err := m.Expiry.MarshalToSizedBuffer(dAtA[:i])
+			size, err := m.ExpiryTime.MarshalToSizedBuffer(dAtA[:i])
 			if err != nil {
 				return 0, err
 			}
@@ -6763,8 +6773,8 @@ func (m *WorkflowExecutionInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0xc0
 	}
-	if m.LastUpdatedTimeNanos != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.LastUpdatedTimeNanos))
+	if m.LastUpdateTimeNanos != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.LastUpdateTimeNanos))
 		i--
 		dAtA[i] = 0x1
 		i--
@@ -7191,8 +7201,8 @@ func (m *NamespaceInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x1a
 	}
-	if m.Status != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.Status))
+	if m.State != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.State))
 		i--
 		dAtA[i] = 0x10
 	}
@@ -7274,8 +7284,8 @@ func (m *NamespaceConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0xaa
 	}
-	if m.VisibilityArchivalStatus != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.VisibilityArchivalStatus))
+	if m.VisibilityArchivalState != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.VisibilityArchivalState))
 		i--
 		dAtA[i] = 0x1
 		i--
@@ -7290,8 +7300,8 @@ func (m *NamespaceConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i--
 		dAtA[i] = 0x9a
 	}
-	if m.HistoryArchivalStatus != 0 {
-		i = encodeVarintMessage(dAtA, i, uint64(m.HistoryArchivalStatus))
+	if m.HistoryArchivalState != 0 {
+		i = encodeVarintMessage(dAtA, i, uint64(m.HistoryArchivalState))
 		i--
 		dAtA[i] = 0x1
 		i--
@@ -7586,8 +7596,8 @@ func (m *ActivityInfo) Size() (n int) {
 		l = m.LastHeartbeatDetails.Size()
 		n += 2 + l + sovMessage(uint64(l))
 	}
-	if m.LastHeartbeatUpdatedTime != nil {
-		l = m.LastHeartbeatUpdatedTime.Size()
+	if m.LastHeartbeatUpdateTime != nil {
+		l = m.LastHeartbeatUpdateTime.Size()
 		n += 2 + l + sovMessage(uint64(l))
 	}
 	return n
@@ -7618,12 +7628,12 @@ func (m *ShardInfo) Size() (n int) {
 	if m.StolenSinceRenew != 0 {
 		n += 1 + sovMessage(uint64(m.StolenSinceRenew))
 	}
-	if m.UpdatedAt != nil {
-		l = m.UpdatedAt.Size()
+	if m.UpdateTime != nil {
+		l = m.UpdateTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
-	if m.TimerAckLevel != nil {
-		l = m.TimerAckLevel.Size()
+	if m.TimerAckLevelTime != nil {
+		l = m.TimerAckLevelTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
 	if m.NamespaceNotificationVersion != 0 {
@@ -7777,8 +7787,8 @@ func (m *TimerTaskInfo) Size() (n int) {
 	if m.TaskId != 0 {
 		n += 1 + sovMessage(uint64(m.TaskId))
 	}
-	if m.VisibilityTimestamp != nil {
-		l = m.VisibilityTimestamp.Size()
+	if m.VisibilityTime != nil {
+		l = m.VisibilityTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
 	return n
@@ -7833,8 +7843,8 @@ func (m *TransferTaskInfo) Size() (n int) {
 	if m.TaskId != 0 {
 		n += 1 + sovMessage(uint64(m.TaskId))
 	}
-	if m.VisibilityTimestamp != nil {
-		l = m.VisibilityTimestamp.Size()
+	if m.VisibilityTime != nil {
+		l = m.VisibilityTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
 	if m.RecordVisibility {
@@ -7953,12 +7963,12 @@ func (m *TaskInfo) Size() (n int) {
 	if m.ScheduleId != 0 {
 		n += 1 + sovMessage(uint64(m.ScheduleId))
 	}
-	if m.CreatedTime != nil {
-		l = m.CreatedTime.Size()
+	if m.CreateTime != nil {
+		l = m.CreateTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
-	if m.Expiry != nil {
-		l = m.Expiry.Size()
+	if m.ExpiryTime != nil {
+		l = m.ExpiryTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
 	return n
@@ -8003,12 +8013,12 @@ func (m *TaskQueueInfo) Size() (n int) {
 	if m.AckLevel != 0 {
 		n += 1 + sovMessage(uint64(m.AckLevel))
 	}
-	if m.Expiry != nil {
-		l = m.Expiry.Size()
+	if m.ExpiryTime != nil {
+		l = m.ExpiryTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
-	if m.LastUpdated != nil {
-		l = m.LastUpdated.Size()
+	if m.LastUpdateTime != nil {
+		l = m.LastUpdateTime.Size()
 		n += 1 + l + sovMessage(uint64(l))
 	}
 	return n
@@ -8164,8 +8174,8 @@ func (m *WorkflowExecutionInfo) Size() (n int) {
 	if m.StartTimeNanos != 0 {
 		n += 2 + sovMessage(uint64(m.StartTimeNanos))
 	}
-	if m.LastUpdatedTimeNanos != 0 {
-		n += 2 + sovMessage(uint64(m.LastUpdatedTimeNanos))
+	if m.LastUpdateTimeNanos != 0 {
+		n += 2 + sovMessage(uint64(m.LastUpdateTimeNanos))
 	}
 	if m.DecisionVersion != 0 {
 		n += 2 + sovMessage(uint64(m.DecisionVersion))
@@ -8440,8 +8450,8 @@ func (m *NamespaceInfo) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovMessage(uint64(l))
 	}
-	if m.Status != 0 {
-		n += 1 + sovMessage(uint64(m.Status))
+	if m.State != 0 {
+		n += 1 + sovMessage(uint64(m.State))
 	}
 	l = len(m.Name)
 	if l > 0 {
@@ -8505,15 +8515,15 @@ func (m *NamespaceConfig) Size() (n int) {
 		l = m.BadBinaries.Size()
 		n += 2 + l + sovMessage(uint64(l))
 	}
-	if m.HistoryArchivalStatus != 0 {
-		n += 2 + sovMessage(uint64(m.HistoryArchivalStatus))
+	if m.HistoryArchivalState != 0 {
+		n += 2 + sovMessage(uint64(m.HistoryArchivalState))
 	}
 	l = len(m.HistoryArchivalUri)
 	if l > 0 {
 		n += 2 + l + sovMessage(uint64(l))
 	}
-	if m.VisibilityArchivalStatus != 0 {
-		n += 2 + sovMessage(uint64(m.VisibilityArchivalStatus))
+	if m.VisibilityArchivalState != 0 {
+		n += 2 + sovMessage(uint64(m.VisibilityArchivalState))
 	}
 	l = len(m.VisibilityArchivalUri)
 	if l > 0 {
@@ -8619,7 +8629,7 @@ func (this *ActivityInfo) String() string {
 		`NamespaceId:` + fmt.Sprintf("%v", this.NamespaceId) + `,`,
 		`ScheduleId:` + fmt.Sprintf("%v", this.ScheduleId) + `,`,
 		`LastHeartbeatDetails:` + strings.Replace(fmt.Sprintf("%v", this.LastHeartbeatDetails), "Payloads", "v11.Payloads", 1) + `,`,
-		`LastHeartbeatUpdatedTime:` + strings.Replace(fmt.Sprintf("%v", this.LastHeartbeatUpdatedTime), "Timestamp", "types.Timestamp", 1) + `,`,
+		`LastHeartbeatUpdateTime:` + strings.Replace(fmt.Sprintf("%v", this.LastHeartbeatUpdateTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -8675,8 +8685,8 @@ func (this *ShardInfo) String() string {
 		`ReplicationAckLevel:` + fmt.Sprintf("%v", this.ReplicationAckLevel) + `,`,
 		`TransferAckLevel:` + fmt.Sprintf("%v", this.TransferAckLevel) + `,`,
 		`StolenSinceRenew:` + fmt.Sprintf("%v", this.StolenSinceRenew) + `,`,
-		`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
-		`TimerAckLevel:` + strings.Replace(fmt.Sprintf("%v", this.TimerAckLevel), "Timestamp", "types.Timestamp", 1) + `,`,
+		`UpdateTime:` + strings.Replace(fmt.Sprintf("%v", this.UpdateTime), "Timestamp", "types.Timestamp", 1) + `,`,
+		`TimerAckLevelTime:` + strings.Replace(fmt.Sprintf("%v", this.TimerAckLevelTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`NamespaceNotificationVersion:` + fmt.Sprintf("%v", this.NamespaceNotificationVersion) + `,`,
 		`ClusterTransferAckLevel:` + mapStringForClusterTransferAckLevel + `,`,
 		`ClusterTimerAckLevel:` + mapStringForClusterTimerAckLevel + `,`,
@@ -8735,7 +8745,7 @@ func (this *TimerTaskInfo) String() string {
 		`ScheduleAttempt:` + fmt.Sprintf("%v", this.ScheduleAttempt) + `,`,
 		`EventId:` + fmt.Sprintf("%v", this.EventId) + `,`,
 		`TaskId:` + fmt.Sprintf("%v", this.TaskId) + `,`,
-		`VisibilityTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.VisibilityTimestamp), "Timestamp", "types.Timestamp", 1) + `,`,
+		`VisibilityTime:` + strings.Replace(fmt.Sprintf("%v", this.VisibilityTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -8757,7 +8767,7 @@ func (this *TransferTaskInfo) String() string {
 		`ScheduleId:` + fmt.Sprintf("%v", this.ScheduleId) + `,`,
 		`Version:` + fmt.Sprintf("%v", this.Version) + `,`,
 		`TaskId:` + fmt.Sprintf("%v", this.TaskId) + `,`,
-		`VisibilityTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.VisibilityTimestamp), "Timestamp", "types.Timestamp", 1) + `,`,
+		`VisibilityTime:` + strings.Replace(fmt.Sprintf("%v", this.VisibilityTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`RecordVisibility:` + fmt.Sprintf("%v", this.RecordVisibility) + `,`,
 		`}`,
 	}, "")
@@ -8827,8 +8837,8 @@ func (this *TaskInfo) String() string {
 		`WorkflowId:` + fmt.Sprintf("%v", this.WorkflowId) + `,`,
 		`RunId:` + fmt.Sprintf("%v", this.RunId) + `,`,
 		`ScheduleId:` + fmt.Sprintf("%v", this.ScheduleId) + `,`,
-		`CreatedTime:` + strings.Replace(fmt.Sprintf("%v", this.CreatedTime), "Timestamp", "types.Timestamp", 1) + `,`,
-		`Expiry:` + strings.Replace(fmt.Sprintf("%v", this.Expiry), "Timestamp", "types.Timestamp", 1) + `,`,
+		`CreateTime:` + strings.Replace(fmt.Sprintf("%v", this.CreateTime), "Timestamp", "types.Timestamp", 1) + `,`,
+		`ExpiryTime:` + strings.Replace(fmt.Sprintf("%v", this.ExpiryTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -8854,8 +8864,8 @@ func (this *TaskQueueInfo) String() string {
 		`TaskType:` + fmt.Sprintf("%v", this.TaskType) + `,`,
 		`Kind:` + fmt.Sprintf("%v", this.Kind) + `,`,
 		`AckLevel:` + fmt.Sprintf("%v", this.AckLevel) + `,`,
-		`Expiry:` + strings.Replace(fmt.Sprintf("%v", this.Expiry), "Timestamp", "types.Timestamp", 1) + `,`,
-		`LastUpdated:` + strings.Replace(fmt.Sprintf("%v", this.LastUpdated), "Timestamp", "types.Timestamp", 1) + `,`,
+		`ExpiryTime:` + strings.Replace(fmt.Sprintf("%v", this.ExpiryTime), "Timestamp", "types.Timestamp", 1) + `,`,
+		`LastUpdateTime:` + strings.Replace(fmt.Sprintf("%v", this.LastUpdateTime), "Timestamp", "types.Timestamp", 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -8946,7 +8956,7 @@ func (this *WorkflowExecutionInfo) String() string {
 		`LastFirstEventId:` + fmt.Sprintf("%v", this.LastFirstEventId) + `,`,
 		`LastProcessedEvent:` + fmt.Sprintf("%v", this.LastProcessedEvent) + `,`,
 		`StartTimeNanos:` + fmt.Sprintf("%v", this.StartTimeNanos) + `,`,
-		`LastUpdatedTimeNanos:` + fmt.Sprintf("%v", this.LastUpdatedTimeNanos) + `,`,
+		`LastUpdateTimeNanos:` + fmt.Sprintf("%v", this.LastUpdateTimeNanos) + `,`,
 		`DecisionVersion:` + fmt.Sprintf("%v", this.DecisionVersion) + `,`,
 		`DecisionScheduleId:` + fmt.Sprintf("%v", this.DecisionScheduleId) + `,`,
 		`DecisionStartedId:` + fmt.Sprintf("%v", this.DecisionStartedId) + `,`,
@@ -9055,7 +9065,7 @@ func (this *NamespaceInfo) String() string {
 	mapStringForData += "}"
 	s := strings.Join([]string{`&NamespaceInfo{`,
 		`Id:` + fmt.Sprintf("%v", this.Id) + `,`,
-		`Status:` + fmt.Sprintf("%v", this.Status) + `,`,
+		`State:` + fmt.Sprintf("%v", this.State) + `,`,
 		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
 		`Description:` + fmt.Sprintf("%v", this.Description) + `,`,
 		`Owner:` + fmt.Sprintf("%v", this.Owner) + `,`,
@@ -9084,9 +9094,9 @@ func (this *NamespaceConfig) String() string {
 		`EmitMetric:` + fmt.Sprintf("%v", this.EmitMetric) + `,`,
 		`ArchivalBucket:` + fmt.Sprintf("%v", this.ArchivalBucket) + `,`,
 		`BadBinaries:` + strings.Replace(fmt.Sprintf("%v", this.BadBinaries), "BadBinaries", "v15.BadBinaries", 1) + `,`,
-		`HistoryArchivalStatus:` + fmt.Sprintf("%v", this.HistoryArchivalStatus) + `,`,
+		`HistoryArchivalState:` + fmt.Sprintf("%v", this.HistoryArchivalState) + `,`,
 		`HistoryArchivalUri:` + fmt.Sprintf("%v", this.HistoryArchivalUri) + `,`,
-		`VisibilityArchivalStatus:` + fmt.Sprintf("%v", this.VisibilityArchivalStatus) + `,`,
+		`VisibilityArchivalState:` + fmt.Sprintf("%v", this.VisibilityArchivalState) + `,`,
 		`VisibilityArchivalUri:` + fmt.Sprintf("%v", this.VisibilityArchivalUri) + `,`,
 		`}`,
 	}, "")
@@ -10069,7 +10079,7 @@ func (m *ActivityInfo) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 34:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LastHeartbeatUpdatedTime", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field LastHeartbeatUpdateTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -10096,10 +10106,10 @@ func (m *ActivityInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.LastHeartbeatUpdatedTime == nil {
-				m.LastHeartbeatUpdatedTime = &types.Timestamp{}
+			if m.LastHeartbeatUpdateTime == nil {
+				m.LastHeartbeatUpdateTime = &types.Timestamp{}
 			}
-			if err := m.LastHeartbeatUpdatedTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.LastHeartbeatUpdateTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -10285,7 +10295,7 @@ func (m *ShardInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 7:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field UpdatedAt", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field UpdateTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -10312,16 +10322,16 @@ func (m *ShardInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.UpdatedAt == nil {
-				m.UpdatedAt = &types.Timestamp{}
+			if m.UpdateTime == nil {
+				m.UpdateTime = &types.Timestamp{}
 			}
-			if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.UpdateTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 8:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TimerAckLevel", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field TimerAckLevelTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -10348,10 +10358,10 @@ func (m *ShardInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.TimerAckLevel == nil {
-				m.TimerAckLevel = &types.Timestamp{}
+			if m.TimerAckLevelTime == nil {
+				m.TimerAckLevelTime = &types.Timestamp{}
 			}
-			if err := m.TimerAckLevel.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.TimerAckLevelTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -11644,7 +11654,7 @@ func (m *TimerTaskInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 11:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityTimestamp", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -11671,10 +11681,10 @@ func (m *TimerTaskInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.VisibilityTimestamp == nil {
-				m.VisibilityTimestamp = &types.Timestamp{}
+			if m.VisibilityTime == nil {
+				m.VisibilityTime = &types.Timestamp{}
 			}
-			if err := m.VisibilityTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.VisibilityTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -12053,7 +12063,7 @@ func (m *TransferTaskInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 13:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityTimestamp", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -12080,10 +12090,10 @@ func (m *TransferTaskInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.VisibilityTimestamp == nil {
-				m.VisibilityTimestamp = &types.Timestamp{}
+			if m.VisibilityTime == nil {
+				m.VisibilityTime = &types.Timestamp{}
 			}
-			if err := m.VisibilityTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.VisibilityTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -12886,7 +12896,7 @@ func (m *TaskInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 5:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field CreatedTime", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field CreateTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -12913,16 +12923,16 @@ func (m *TaskInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.CreatedTime == nil {
-				m.CreatedTime = &types.Timestamp{}
+			if m.CreateTime == nil {
+				m.CreateTime = &types.Timestamp{}
 			}
-			if err := m.CreatedTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.CreateTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 6:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Expiry", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ExpiryTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -12949,10 +12959,10 @@ func (m *TaskInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.Expiry == nil {
-				m.Expiry = &types.Timestamp{}
+			if m.ExpiryTime == nil {
+				m.ExpiryTime = &types.Timestamp{}
 			}
-			if err := m.Expiry.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ExpiryTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -13240,7 +13250,7 @@ func (m *TaskQueueInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 7:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Expiry", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ExpiryTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -13267,16 +13277,16 @@ func (m *TaskQueueInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.Expiry == nil {
-				m.Expiry = &types.Timestamp{}
+			if m.ExpiryTime == nil {
+				m.ExpiryTime = &types.Timestamp{}
 			}
-			if err := m.Expiry.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.ExpiryTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
 		case 8:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LastUpdated", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field LastUpdateTime", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -13303,10 +13313,10 @@ func (m *TaskQueueInfo) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.LastUpdated == nil {
-				m.LastUpdated = &types.Timestamp{}
+			if m.LastUpdateTime == nil {
+				m.LastUpdateTime = &types.Timestamp{}
 			}
-			if err := m.LastUpdated.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if err := m.LastUpdateTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -14375,9 +14385,9 @@ func (m *WorkflowExecutionInfo) Unmarshal(dAtA []byte) error {
 			}
 		case 23:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LastUpdatedTimeNanos", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field LastUpdateTimeNanos", wireType)
 			}
-			m.LastUpdatedTimeNanos = 0
+			m.LastUpdateTimeNanos = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -14387,7 +14397,7 @@ func (m *WorkflowExecutionInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.LastUpdatedTimeNanos |= int64(b&0x7F) << shift
+				m.LastUpdateTimeNanos |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -16399,9 +16409,9 @@ func (m *NamespaceInfo) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field State", wireType)
 			}
-			m.Status = 0
+			m.State = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -16411,7 +16421,7 @@ func (m *NamespaceInfo) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Status |= v14.NamespaceStatus(b&0x7F) << shift
+				m.State |= v14.NamespaceState(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -16918,9 +16928,9 @@ func (m *NamespaceConfig) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 18:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field HistoryArchivalStatus", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field HistoryArchivalState", wireType)
 			}
-			m.HistoryArchivalStatus = 0
+			m.HistoryArchivalState = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -16930,7 +16940,7 @@ func (m *NamespaceConfig) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.HistoryArchivalStatus |= v14.ArchivalStatus(b&0x7F) << shift
+				m.HistoryArchivalState |= v14.ArchivalState(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -16969,9 +16979,9 @@ func (m *NamespaceConfig) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 20:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityArchivalStatus", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field VisibilityArchivalState", wireType)
 			}
-			m.VisibilityArchivalStatus = 0
+			m.VisibilityArchivalState = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowMessage
@@ -16981,7 +16991,7 @@ func (m *NamespaceConfig) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.VisibilityArchivalStatus |= v14.ArchivalStatus(b&0x7F) << shift
+				m.VisibilityArchivalState |= v14.ArchivalState(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
diff --git a/client/admin/client.go b/client/admin/client.go
index 6f33aee0a7b..cf50e8dfb49 100644
--- a/client/admin/client.go
+++ b/client/admin/client.go
@@ -226,18 +226,18 @@ func (c *clientImpl) ReapplyEvents(
 	return client.ReapplyEvents(ctx, request, opts...)
 }
 
-func (c *clientImpl) ReadDLQMessages(
+func (c *clientImpl) GetDLQMessages(
 	ctx context.Context,
-	request *adminservice.ReadDLQMessagesRequest,
+	request *adminservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*adminservice.ReadDLQMessagesResponse, error) {
+) (*adminservice.GetDLQMessagesResponse, error) {
 	client, err := c.getRandomClient()
 	if err != nil {
 		return nil, err
 	}
 	ctx, cancel := c.createContext(ctx)
 	defer cancel()
-	return client.ReadDLQMessages(ctx, request, opts...)
+	return client.GetDLQMessages(ctx, request, opts...)
 }
 
 func (c *clientImpl) PurgeDLQMessages(
diff --git a/client/admin/metricClient.go b/client/admin/metricClient.go
index b45e2db34bd..f7e3e83185d 100644
--- a/client/admin/metricClient.go
+++ b/client/admin/metricClient.go
@@ -260,19 +260,19 @@ func (c *metricClient) ReapplyEvents(
 	return resp, err
 }
 
-func (c *metricClient) ReadDLQMessages(
+func (c *metricClient) GetDLQMessages(
 	ctx context.Context,
-	request *adminservice.ReadDLQMessagesRequest,
+	request *adminservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*adminservice.ReadDLQMessagesResponse, error) {
+) (*adminservice.GetDLQMessagesResponse, error) {
 
-	c.metricsClient.IncCounter(metrics.AdminClientReadDLQMessagesScope, metrics.ClientRequests)
-	sw := c.metricsClient.StartTimer(metrics.AdminClientReadDLQMessagesScope, metrics.ClientLatency)
-	resp, err := c.client.ReadDLQMessages(ctx, request, opts...)
+	c.metricsClient.IncCounter(metrics.AdminClientGetDLQMessagesScope, metrics.ClientRequests)
+	sw := c.metricsClient.StartTimer(metrics.AdminClientGetDLQMessagesScope, metrics.ClientLatency)
+	resp, err := c.client.GetDLQMessages(ctx, request, opts...)
 	sw.Stop()
 
 	if err != nil {
-		c.metricsClient.IncCounter(metrics.AdminClientReadDLQMessagesScope, metrics.ClientFailures)
+		c.metricsClient.IncCounter(metrics.AdminClientGetDLQMessagesScope, metrics.ClientFailures)
 	}
 	return resp, err
 }
diff --git a/client/admin/retryableClient.go b/client/admin/retryableClient.go
index f4f70766b82..545f17b7871 100644
--- a/client/admin/retryableClient.go
+++ b/client/admin/retryableClient.go
@@ -238,16 +238,16 @@ func (c *retryableClient) ReapplyEvents(
 	return resp, err
 }
 
-func (c *retryableClient) ReadDLQMessages(
+func (c *retryableClient) GetDLQMessages(
 	ctx context.Context,
-	request *adminservice.ReadDLQMessagesRequest,
+	request *adminservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*adminservice.ReadDLQMessagesResponse, error) {
+) (*adminservice.GetDLQMessagesResponse, error) {
 
-	var resp *adminservice.ReadDLQMessagesResponse
+	var resp *adminservice.GetDLQMessagesResponse
 	op := func() error {
 		var err error
-		resp, err = c.client.ReadDLQMessages(ctx, request, opts...)
+		resp, err = c.client.GetDLQMessages(ctx, request, opts...)
 		return err
 	}
 	err := backoff.Retry(op, c.policy, c.isRetryable)
diff --git a/client/history/client.go b/client/history/client.go
index 6ec29246d2b..a12ca579684 100644
--- a/client/history/client.go
+++ b/client/history/client.go
@@ -971,17 +971,17 @@ func (c *clientImpl) ReapplyEvents(
 
 }
 
-func (c *clientImpl) ReadDLQMessages(
+func (c *clientImpl) GetDLQMessages(
 	ctx context.Context,
-	request *historyservice.ReadDLQMessagesRequest,
+	request *historyservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*historyservice.ReadDLQMessagesResponse, error) {
+) (*historyservice.GetDLQMessagesResponse, error) {
 
 	client, err := c.getClientForShardID(int(request.GetShardId()))
 	if err != nil {
 		return nil, err
 	}
-	return client.ReadDLQMessages(ctx, request, opts...)
+	return client.GetDLQMessages(ctx, request, opts...)
 }
 
 func (c *clientImpl) PurgeDLQMessages(
diff --git a/client/history/metricClient.go b/client/history/metricClient.go
index 3f49f0fd644..b992bdf7d56 100644
--- a/client/history/metricClient.go
+++ b/client/history/metricClient.go
@@ -593,19 +593,19 @@ func (c *metricClient) ReapplyEvents(
 	return resp, err
 }
 
-func (c *metricClient) ReadDLQMessages(
+func (c *metricClient) GetDLQMessages(
 	ctx context.Context,
-	request *historyservice.ReadDLQMessagesRequest,
+	request *historyservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*historyservice.ReadDLQMessagesResponse, error) {
+) (*historyservice.GetDLQMessagesResponse, error) {
 
-	c.metricsClient.IncCounter(metrics.HistoryClientReadDLQMessagesScope, metrics.ClientRequests)
-	sw := c.metricsClient.StartTimer(metrics.HistoryClientReadDLQMessagesScope, metrics.ClientLatency)
-	resp, err := c.client.ReadDLQMessages(ctx, request, opts...)
+	c.metricsClient.IncCounter(metrics.HistoryClientGetDLQMessagesScope, metrics.ClientRequests)
+	sw := c.metricsClient.StartTimer(metrics.HistoryClientGetDLQMessagesScope, metrics.ClientLatency)
+	resp, err := c.client.GetDLQMessages(ctx, request, opts...)
 	sw.Stop()
 
 	if err != nil {
-		c.metricsClient.IncCounter(metrics.HistoryClientReadDLQMessagesScope, metrics.ClientFailures)
+		c.metricsClient.IncCounter(metrics.HistoryClientGetDLQMessagesScope, metrics.ClientFailures)
 	}
 	return resp, err
 }
diff --git a/client/history/retryableClient.go b/client/history/retryableClient.go
index 64ebc52f96a..af7a7494534 100644
--- a/client/history/retryableClient.go
+++ b/client/history/retryableClient.go
@@ -591,16 +591,16 @@ func (c *retryableClient) ReapplyEvents(
 	return resp, err
 }
 
-func (c *retryableClient) ReadDLQMessages(
+func (c *retryableClient) GetDLQMessages(
 	ctx context.Context,
-	request *historyservice.ReadDLQMessagesRequest,
+	request *historyservice.GetDLQMessagesRequest,
 	opts ...grpc.CallOption,
-) (*historyservice.ReadDLQMessagesResponse, error) {
+) (*historyservice.GetDLQMessagesResponse, error) {
 
-	var resp *historyservice.ReadDLQMessagesResponse
+	var resp *historyservice.GetDLQMessagesResponse
 	op := func() error {
 		var err error
-		resp, err = c.client.ReadDLQMessages(ctx, request, opts...)
+		resp, err = c.client.GetDLQMessages(ctx, request, opts...)
 		return err
 	}
 
diff --git a/cmd/server/temporal/server.go b/cmd/server/temporal/server.go
index c0f3ea7c020..09f21f7c379 100644
--- a/cmd/server/temporal/server.go
+++ b/cmd/server/temporal/server.go
@@ -238,9 +238,9 @@ func (s *server) startService() common.Daemon {
 
 	params.ArchivalMetadata = archiver.NewArchivalMetadata(
 		dc,
-		s.cfg.Archival.History.Status,
+		s.cfg.Archival.History.State,
 		s.cfg.Archival.History.EnableRead,
-		s.cfg.Archival.Visibility.Status,
+		s.cfg.Archival.Visibility.State,
 		s.cfg.Archival.Visibility.EnableRead,
 		&s.cfg.NamespaceDefaults.Archival,
 	)
diff --git a/common/archiver/archivalMetadata.go b/common/archiver/archivalMetadata.go
index d8eaa1b4ca4..7ab642128e1 100644
--- a/common/archiver/archivalMetadata.go
+++ b/common/archiver/archivalMetadata.go
@@ -46,9 +46,9 @@ type (
 	// This config is determined at cluster startup time
 	ArchivalConfig interface {
 		ClusterConfiguredForArchival() bool
-		GetClusterStatus() ArchivalStatus
+		GetClusterState() ArchivalState
 		ReadEnabled() bool
-		GetNamespaceDefaultStatus() enumspb.ArchivalStatus
+		GetNamespaceDefaultState() enumspb.ArchivalState
 		GetNamespaceDefaultURI() string
 	}
 
@@ -58,20 +58,20 @@ type (
 	}
 
 	archivalConfig struct {
-		staticClusterStatus    ArchivalStatus
-		dynamicClusterStatus   dynamicconfig.StringPropertyFn
-		enableRead             dynamicconfig.BoolPropertyFn
-		namespaceDefaultStatus enumspb.ArchivalStatus
-		namespaceDefaultURI    string
+		staticClusterState    ArchivalState
+		dynamicClusterState   dynamicconfig.StringPropertyFn
+		enableRead            dynamicconfig.BoolPropertyFn
+		namespaceDefaultState enumspb.ArchivalState
+		namespaceDefaultURI   string
 	}
 
-	// ArchivalStatus represents the archival status of the cluster
-	ArchivalStatus int
+	// ArchivalState represents the archival state of the cluster
+	ArchivalState int
 )
 
 const (
 	// ArchivalDisabled means this cluster is not configured to handle archival
-	ArchivalDisabled ArchivalStatus = iota
+	ArchivalDisabled ArchivalState = iota
 	// ArchivalPaused means this cluster is configured to handle archival but is currently not archiving
 	// This state is not yet implemented, as of now ArchivalPaused is treated the same way as ArchivalDisabled
 	ArchivalPaused
@@ -82,25 +82,25 @@ const (
 // NewArchivalMetadata constructs a new ArchivalMetadata
 func NewArchivalMetadata(
 	dc *dynamicconfig.Collection,
-	historyStatus string,
+	historyState string,
 	historyReadEnabled bool,
-	visibilityStatus string,
+	visibilityState string,
 	visibilityReadEnabled bool,
 	namespaceDefaults *config.ArchivalNamespaceDefaults,
 ) ArchivalMetadata {
 	historyConfig := NewArchivalConfig(
-		historyStatus,
-		dc.GetStringProperty(dynamicconfig.HistoryArchivalStatus, historyStatus),
+		historyState,
+		dc.GetStringProperty(dynamicconfig.HistoryArchivalState, historyState),
 		dc.GetBoolProperty(dynamicconfig.EnableReadFromHistoryArchival, historyReadEnabled),
-		namespaceDefaults.History.Status,
+		namespaceDefaults.History.State,
 		namespaceDefaults.History.URI,
 	)
 
 	visibilityConfig := NewArchivalConfig(
-		visibilityStatus,
-		dc.GetStringProperty(dynamicconfig.VisibilityArchivalStatus, visibilityStatus),
+		visibilityState,
+		dc.GetStringProperty(dynamicconfig.VisibilityArchivalState, visibilityState),
 		dc.GetBoolProperty(dynamicconfig.EnableReadFromVisibilityArchival, visibilityReadEnabled),
-		namespaceDefaults.Visibility.Status,
+		namespaceDefaults.Visibility.State,
 		namespaceDefaults.Visibility.URI,
 	)
 
@@ -120,62 +120,62 @@ func (metadata *archivalMetadata) GetVisibilityConfig() ArchivalConfig {
 
 // NewArchivalConfig constructs a new valid ArchivalConfig
 func NewArchivalConfig(
-	staticClusterStatusStr string,
-	dynamicClusterStatus dynamicconfig.StringPropertyFn,
+	staticClusterStateStr string,
+	dynamicClusterState dynamicconfig.StringPropertyFn,
 	enableRead dynamicconfig.BoolPropertyFn,
-	namespaceDefaultStatusStr string,
+	namespaceDefaultStateStr string,
 	namespaceDefaultURI string,
 ) ArchivalConfig {
-	staticClusterStatus, err := getClusterArchivalStatus(staticClusterStatusStr)
+	staticClusterState, err := getClusterArchivalState(staticClusterStateStr)
 	if err != nil {
 		panic(err)
 	}
-	namespaceDefaultStatus, err := getNamespaceArchivalStatus(namespaceDefaultStatusStr)
+	namespaceDefaultState, err := getNamespaceArchivalState(namespaceDefaultStateStr)
 	if err != nil {
 		panic(err)
 	}
 
 	return &archivalConfig{
-		staticClusterStatus:    staticClusterStatus,
-		dynamicClusterStatus:   dynamicClusterStatus,
-		enableRead:             enableRead,
-		namespaceDefaultStatus: namespaceDefaultStatus,
-		namespaceDefaultURI:    namespaceDefaultURI,
+		staticClusterState:    staticClusterState,
+		dynamicClusterState:   dynamicClusterState,
+		enableRead:            enableRead,
+		namespaceDefaultState: namespaceDefaultState,
+		namespaceDefaultURI:   namespaceDefaultURI,
 	}
 }
 
 // NewDisabledArchvialConfig returns a disabled ArchivalConfig
 func NewDisabledArchvialConfig() ArchivalConfig {
 	return &archivalConfig{
-		staticClusterStatus:    ArchivalDisabled,
-		dynamicClusterStatus:   nil,
-		enableRead:             nil,
-		namespaceDefaultStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-		namespaceDefaultURI:    "",
+		staticClusterState:    ArchivalDisabled,
+		dynamicClusterState:   nil,
+		enableRead:            nil,
+		namespaceDefaultState: enumspb.ARCHIVAL_STATE_DISABLED,
+		namespaceDefaultURI:   "",
 	}
 }
 
 // ClusterConfiguredForArchival returns true if cluster is configured to handle archival, false otherwise
 func (a *archivalConfig) ClusterConfiguredForArchival() bool {
-	return a.GetClusterStatus() == ArchivalEnabled
+	return a.GetClusterState() == ArchivalEnabled
 }
 
-func (a *archivalConfig) GetClusterStatus() ArchivalStatus {
+func (a *archivalConfig) GetClusterState() ArchivalState {
 	// Only check dynamic config when archival is enabled in static config.
 	// If archival is disabled in static config, there will be no provider section in the static config
 	// and the archiver provider can not create any archiver. Therefore, in that case,
 	// even dynamic config says archival is enabled, we should ignore that.
 	// Only when archival is enabled in static config, should we check if there's any difference between static config and dynamic config.
-	if a.staticClusterStatus != ArchivalEnabled {
-		return a.staticClusterStatus
+	if a.staticClusterState != ArchivalEnabled {
+		return a.staticClusterState
 	}
 
-	dynamicStatusStr := a.dynamicClusterStatus()
-	dynamicStatus, err := getClusterArchivalStatus(dynamicStatusStr)
+	dynamicStateStr := a.dynamicClusterState()
+	dynamicState, err := getClusterArchivalState(dynamicStateStr)
 	if err != nil {
 		return ArchivalDisabled
 	}
-	return dynamicStatus
+	return dynamicState
 }
 
 func (a *archivalConfig) ReadEnabled() bool {
@@ -185,15 +185,15 @@ func (a *archivalConfig) ReadEnabled() bool {
 	return a.enableRead()
 }
 
-func (a *archivalConfig) GetNamespaceDefaultStatus() enumspb.ArchivalStatus {
-	return a.namespaceDefaultStatus
+func (a *archivalConfig) GetNamespaceDefaultState() enumspb.ArchivalState {
+	return a.namespaceDefaultState
 }
 
 func (a *archivalConfig) GetNamespaceDefaultURI() string {
 	return a.namespaceDefaultURI
 }
 
-func getClusterArchivalStatus(str string) (ArchivalStatus, error) {
+func getClusterArchivalState(str string) (ArchivalState, error) {
 	str = strings.TrimSpace(strings.ToLower(str))
 	switch str {
 	case "", common.ArchivalDisabled:
@@ -203,16 +203,16 @@ func getClusterArchivalStatus(str string) (ArchivalStatus, error) {
 	case common.ArchivalEnabled:
 		return ArchivalEnabled, nil
 	}
-	return ArchivalDisabled, fmt.Errorf("invalid archival status of %v for cluster, valid status are: {\"\", \"disabled\", \"paused\", \"enabled\"}", str)
+	return ArchivalDisabled, fmt.Errorf("invalid archival state of %v for cluster, valid states are: {\"\", \"disabled\", \"paused\", \"enabled\"}", str)
 }
 
-func getNamespaceArchivalStatus(str string) (enumspb.ArchivalStatus, error) {
+func getNamespaceArchivalState(str string) (enumspb.ArchivalState, error) {
 	str = strings.TrimSpace(strings.ToLower(str))
 	switch str {
 	case "", common.ArchivalDisabled:
-		return enumspb.ARCHIVAL_STATUS_DISABLED, nil
+		return enumspb.ARCHIVAL_STATE_DISABLED, nil
 	case common.ArchivalEnabled:
-		return enumspb.ARCHIVAL_STATUS_ENABLED, nil
+		return enumspb.ARCHIVAL_STATE_ENABLED, nil
 	}
-	return enumspb.ARCHIVAL_STATUS_DISABLED, fmt.Errorf("invalid archival status of %v for namespace, valid status are: {\"\", \"disabled\", \"enabled\"}", str)
+	return enumspb.ARCHIVAL_STATE_DISABLED, fmt.Errorf("invalid archival state of %v for namespace, valid states are: {\"\", \"disabled\", \"enabled\"}", str)
 }
diff --git a/common/archiver/gcloud/README.md b/common/archiver/gcloud/README.md
index 7290967a0cc..aa707e50f85 100644
--- a/common/archiver/gcloud/README.md
+++ b/common/archiver/gcloud/README.md
@@ -21,13 +21,13 @@ Enabling archival is done by using the configuration below. `credentialsPath` is
 ```
 archival:
   history:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       gstorage:
         credentialsPath: "/tmp/keyfile.json"
   visibility:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       gstorage:
@@ -36,10 +36,10 @@ archival:
 namespaceDefaults:
   archival:
     history:
-      status: "enabled"
+      state: "enabled"
       URI: "gs://my-bucket-cad/temporal_archival/development"
     visibility:
-      status: "enabled"
+      state: "enabled"
       URI: "gs://my-bucket-cad/temporal_archival/visibility"
 ```
 
diff --git a/common/archiver/s3store/README.md b/common/archiver/s3store/README.md
index 3f8ad0ccfb2..e2e8f8c1011 100644
--- a/common/archiver/s3store/README.md
+++ b/common/archiver/s3store/README.md
@@ -6,13 +6,13 @@ Enabling archival is done by using the configuration below. `Region` and `bucket
 ```
 archival:
   history:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       s3store:
         region: "us-east-1"
   visibility:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       s3store:
@@ -21,10 +21,10 @@ archival:
 namespaceDefaults:
   archival:
     history:
-      status: "enabled"
+      state: "enabled"
       URI: "s3://<bucket-name>"
     visibility:
-      status: "enabled"
+      state: "enabled"
       URI: "s3://<bucket-name>"
 ```
 
@@ -79,7 +79,7 @@ s3://<bucket-name>/<namespace-id>/
 ```
 archival:
   history:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       s3store:
@@ -87,7 +87,7 @@ archival:
         endpoint: "http://127.0.0.1:4572"
         s3ForcePathStyle: true
   visibility:
-    status: "enabled"
+    state: "enabled"
     enableRead: true
     provider:
       s3store:
@@ -98,9 +98,9 @@ archival:
 namespaceDefaults:
   archival:
     history:
-      status: "enabled"
+      state: "enabled"
       URI: "s3://temporal-development"
     visibility:
-      status: "enabled"
+      state: "enabled"
       URI: "s3://temporal-development"
 ```
diff --git a/common/constants.go b/common/constants.go
index 9858aced733..b93c20f996a 100644
--- a/common/constants.go
+++ b/common/constants.go
@@ -131,11 +131,11 @@ const (
 )
 
 const (
-	// ArchivalEnabled is the status for enabling archival
+	// ArchivalEnabled is the state for enabling archival
 	ArchivalEnabled = "enabled"
-	// ArchivalDisabled is the status for disabling archival
+	// ArchivalDisabled is the state for disabling archival
 	ArchivalDisabled = "disabled"
-	// ArchivalPaused is the status for pausing archival
+	// ArchivalPaused is the state for pausing archival
 	ArchivalPaused = "paused"
 )
 
diff --git a/common/metrics/defs.go b/common/metrics/defs.go
index c623121f6fe..f19b91d22c1 100644
--- a/common/metrics/defs.go
+++ b/common/metrics/defs.go
@@ -346,8 +346,8 @@ const (
 	HistoryClientQueryWorkflowScope
 	// HistoryClientReapplyEventsScope tracks RPC calls to history service
 	HistoryClientReapplyEventsScope
-	// HistoryClientReadDLQMessagesScope tracks RPC calls to history service
-	HistoryClientReadDLQMessagesScope
+	// HistoryClientGetDLQMessagesScope tracks RPC calls to history service
+	HistoryClientGetDLQMessagesScope
 	// HistoryClientPurgeDLQMessagesScope tracks RPC calls to history service
 	HistoryClientPurgeDLQMessagesScope
 	// HistoryClientMergeDLQMessagesScope tracks RPC calls to history service
@@ -474,8 +474,8 @@ const (
 	AdminClientGetWorkflowExecutionRawHistoryV2Scope
 	// AdminClientDescribeClusterScope tracks RPC calls to admin service
 	AdminClientDescribeClusterScope
-	// AdminClientReadDLQMessagesScope tracks RPC calls to admin service
-	AdminClientReadDLQMessagesScope
+	// AdminClientGetDLQMessagesScope tracks RPC calls to admin service
+	AdminClientGetDLQMessagesScope
 	// AdminClientPurgeDLQMessagesScope tracks RPC calls to admin service
 	AdminClientPurgeDLQMessagesScope
 	// AdminClientMergeDLQMessagesScope tracks RPC calls to admin service
@@ -843,7 +843,7 @@ const (
 	HistoryGetReplicationMessagesScope
 	// HistoryGetDLQReplicationMessagesScope tracks GetReplicationMessages API calls received by service
 	HistoryGetDLQReplicationMessagesScope
-	// HistoryReadDLQMessagesScope tracks ReadDLQMessages API calls received by service
+	// HistoryReadDLQMessagesScope tracks GetDLQMessages API calls received by service
 	HistoryReadDLQMessagesScope
 	// HistoryPurgeDLQMessagesScope tracks PurgeDLQMessages API calls received by service
 	HistoryPurgeDLQMessagesScope
@@ -1186,7 +1186,7 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
 		HistoryClientGetDLQReplicationTasksScope:              {operation: "HistoryClientGetDLQReplicationTasksScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
 		HistoryClientQueryWorkflowScope:                       {operation: "HistoryClientQueryWorkflowScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
 		HistoryClientReapplyEventsScope:                       {operation: "HistoryClientReapplyEventsScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
-		HistoryClientReadDLQMessagesScope:                     {operation: "HistoryClientReadDLQMessagesScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
+		HistoryClientGetDLQMessagesScope:                      {operation: "HistoryClientGetDLQMessagesScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
 		HistoryClientPurgeDLQMessagesScope:                    {operation: "HistoryClientPurgeDLQMessagesScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
 		HistoryClientMergeDLQMessagesScope:                    {operation: "HistoryClientMergeDLQMessagesScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
 		HistoryClientRefreshWorkflowTasksScope:                {operation: "HistoryClientRefreshWorkflowTasksScope", tags: map[string]string{ServiceRoleTagName: HistoryRoleTagValue}},
@@ -1252,7 +1252,7 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
 		AdminClientRefreshWorkflowTasksScope:                  {operation: "AdminClientRefreshWorkflowTasks", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
 		AdminClientResendReplicationTasksScope:                {operation: "AdminClientResendReplicationTasks", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
 		AdminClientCloseShardScope:                            {operation: "AdminClientCloseShard", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
-		AdminClientReadDLQMessagesScope:                       {operation: "AdminClientReadDLQMessages", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
+		AdminClientGetDLQMessagesScope:                        {operation: "AdminClientGetDLQMessages", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
 		AdminClientPurgeDLQMessagesScope:                      {operation: "AdminClientPurgeDLQMessages", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
 		AdminClientMergeDLQMessagesScope:                      {operation: "AdminClientMergeDLQMessages", tags: map[string]string{ServiceRoleTagName: AdminRoleTagValue}},
 		DCRedirectionDeprecateNamespaceScope:                  {operation: "DCRedirectionDeprecateNamespace", tags: map[string]string{ServiceRoleTagName: DCRedirectionRoleTagValue}},
@@ -1427,7 +1427,7 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
 		HistoryDescribeMutableStateScope:                       {operation: "DescribeMutableState"},
 		HistoryGetReplicationMessagesScope:                     {operation: "GetReplicationMessages"},
 		HistoryGetDLQReplicationMessagesScope:                  {operation: "GetDLQReplicationMessages"},
-		HistoryReadDLQMessagesScope:                            {operation: "ReadDLQMessages"},
+		HistoryReadDLQMessagesScope:                            {operation: "GetDLQMessages"},
 		HistoryPurgeDLQMessagesScope:                           {operation: "PurgeDLQMessages"},
 		HistoryMergeDLQMessagesScope:                           {operation: "MergeDLQMessages"},
 		HistoryShardControllerScope:                            {operation: "ShardController"},
diff --git a/common/namespace/archivalConfigStateMachine.go b/common/namespace/archivalConfigStateMachine.go
index ef391f4baa8..a88506ca902 100644
--- a/common/namespace/archivalConfigStateMachine.go
+++ b/common/namespace/archivalConfigStateMachine.go
@@ -35,20 +35,20 @@ import (
 
 type (
 	// ArchivalState represents the state of archival config
-	// the only invalid state is {URI="", status=enabled}
+	// the only invalid state is {URI="", state=enabled}
 	// once URI is set it is immutable
 	ArchivalState struct {
-		Status enumspb.ArchivalStatus
-		URI    string
+		State enumspb.ArchivalState
+		URI   string
 	}
 
 	// ArchivalEvent represents a change request to archival config state
 	// the only restriction placed on events is that defaultURI is not empty
-	// status can be nil, enabled, or disabled (nil indicates no update by user is being attempted)
+	// state can be nil, enabled, or disabled (nil indicates no update by user is being attempted)
 	ArchivalEvent struct {
 		defaultURI string
 		URI        string
-		status     enumspb.ArchivalStatus
+		state      enumspb.ArchivalState
 	}
 )
 
@@ -62,8 +62,8 @@ var (
 
 func neverEnabledState() *ArchivalState {
 	return &ArchivalState{
-		URI:    "",
-		Status: enumspb.ARCHIVAL_STATUS_DISABLED,
+		URI:   "",
+		State: enumspb.ARCHIVAL_STATE_DISABLED,
 	}
 }
 
@@ -75,7 +75,7 @@ func (e *ArchivalEvent) validate() error {
 }
 
 func (s *ArchivalState) validate() error {
-	if s.Status == enumspb.ARCHIVAL_STATUS_ENABLED && len(s.URI) == 0 {
+	if s.State == enumspb.ARCHIVAL_STATE_ENABLED && len(s.URI) == 0 {
 		return errInvalidState
 	}
 	return nil
@@ -128,17 +128,17 @@ func (s *ArchivalState) getNextState(
 	At this point state and event are both non-nil and valid.
 
 	State can be any one of the following:
-	{status=enabled,  URI="foo"}
-	{status=disabled, URI="foo"}
-	{status=disabled, URI=""}
+	{state=enabled,  URI="foo"}
+	{state=disabled, URI="foo"}
+	{state=disabled, URI=""}
 
 	Event can be any one of the following:
-	{status=enabled,  URI="foo", defaultURI="bar"}
-	{status=enabled,  URI="",    defaultURI="bar"}
-	{status=disabled, URI="foo", defaultURI="bar"}
-	{status=disabled, URI="",    defaultURI="bar"}
-	{status=nil,      URI="foo", defaultURI="bar"}
-	{status=nil,      URI="",    defaultURI="bar"}
+	{state=enabled,  URI="foo", defaultURI="bar"}
+	{state=enabled,  URI="",    defaultURI="bar"}
+	{state=disabled, URI="foo", defaultURI="bar"}
+	{state=disabled, URI="",    defaultURI="bar"}
+	{state=nil,      URI="foo", defaultURI="bar"}
+	{state=nil,      URI="",    defaultURI="bar"}
 	*/
 
 	stateURISet := len(s.URI) != 0
@@ -150,91 +150,91 @@ func (s *ArchivalState) getNextState(
 	}
 
 	// state 1
-	if s.Status == enumspb.ARCHIVAL_STATUS_ENABLED && stateURISet {
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && eventURISet {
+	if s.State == enumspb.ARCHIVAL_STATE_ENABLED && stateURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && !eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_DISABLED,
-				URI:    s.URI,
+				State: enumspb.ARCHIVAL_STATE_DISABLED,
+				URI:   s.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && !eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_DISABLED,
-				URI:    s.URI,
+				State: enumspb.ARCHIVAL_STATE_DISABLED,
+				URI:   s.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && !eventURISet {
 			return s, false, nil
 		}
 	}
 
 	// state 2
-	if s.Status == enumspb.ARCHIVAL_STATUS_DISABLED && stateURISet {
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && eventURISet {
+	if s.State == enumspb.ARCHIVAL_STATE_DISABLED && stateURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && eventURISet {
 			return &ArchivalState{
-				URI:    s.URI,
-				Status: enumspb.ARCHIVAL_STATUS_ENABLED,
+				URI:   s.URI,
+				State: enumspb.ARCHIVAL_STATE_ENABLED,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && !eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_ENABLED,
-				URI:    s.URI,
+				State: enumspb.ARCHIVAL_STATE_ENABLED,
+				URI:   s.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && !eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && !eventURISet {
 			return s, false, nil
 		}
 	}
 
 	// state 3
-	if s.Status == enumspb.ARCHIVAL_STATUS_DISABLED && !stateURISet {
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && eventURISet {
+	if s.State == enumspb.ARCHIVAL_STATE_DISABLED && !stateURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_ENABLED,
-				URI:    e.URI,
+				State: enumspb.ARCHIVAL_STATE_ENABLED,
+				URI:   e.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_ENABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_ENABLED && !eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_ENABLED,
-				URI:    e.defaultURI,
+				State: enumspb.ARCHIVAL_STATE_ENABLED,
+				URI:   e.defaultURI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_DISABLED,
-				URI:    e.URI,
+				State: enumspb.ARCHIVAL_STATE_DISABLED,
+				URI:   e.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_DISABLED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_DISABLED && !eventURISet {
 			return s, false, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && eventURISet {
 			return &ArchivalState{
-				Status: enumspb.ARCHIVAL_STATUS_DISABLED,
-				URI:    e.URI,
+				State: enumspb.ARCHIVAL_STATE_DISABLED,
+				URI:   e.URI,
 			}, true, nil
 		}
-		if e.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED && !eventURISet {
+		if e.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED && !eventURISet {
 			return s, false, nil
 		}
 	}
diff --git a/common/namespace/attrValidator.go b/common/namespace/attrValidator.go
index 3efe1e697a3..ea85fd07fa6 100644
--- a/common/namespace/attrValidator.go
+++ b/common/namespace/attrValidator.go
@@ -58,10 +58,10 @@ func (d *AttrValidatorImpl) validateNamespaceConfig(config *persistenceblobs.Nam
 	if config.RetentionDays < int32(d.minRetentionDays) {
 		return errInvalidRetentionPeriod
 	}
-	if config.HistoryArchivalStatus == enumspb.ARCHIVAL_STATUS_ENABLED && len(config.HistoryArchivalUri) == 0 {
+	if config.HistoryArchivalState == enumspb.ARCHIVAL_STATE_ENABLED && len(config.HistoryArchivalUri) == 0 {
 		return errInvalidArchivalConfig
 	}
-	if config.VisibilityArchivalStatus == enumspb.ARCHIVAL_STATUS_ENABLED && len(config.VisibilityArchivalUri) == 0 {
+	if config.VisibilityArchivalState == enumspb.ARCHIVAL_STATE_ENABLED && len(config.VisibilityArchivalUri) == 0 {
 		return errInvalidArchivalConfig
 	}
 	return nil
diff --git a/common/namespace/handler.go b/common/namespace/handler.go
index a77acf95f1a..16e13400f8e 100644
--- a/common/namespace/handler.go
+++ b/common/namespace/handler.go
@@ -165,9 +165,9 @@ func (d *HandlerImpl) RegisterNamespace(
 	clusterHistoryArchivalConfig := d.archivalMetadata.GetHistoryConfig()
 	if clusterHistoryArchivalConfig.ClusterConfiguredForArchival() {
 		archivalEvent, err := d.toArchivalRegisterEvent(
-			registerRequest.HistoryArchivalStatus,
+			registerRequest.HistoryArchivalState,
 			registerRequest.GetHistoryArchivalUri(),
-			clusterHistoryArchivalConfig.GetNamespaceDefaultStatus(),
+			clusterHistoryArchivalConfig.GetNamespaceDefaultState(),
 			clusterHistoryArchivalConfig.GetNamespaceDefaultURI(),
 		)
 		if err != nil {
@@ -185,9 +185,9 @@ func (d *HandlerImpl) RegisterNamespace(
 	clusterVisibilityArchivalConfig := d.archivalMetadata.GetVisibilityConfig()
 	if clusterVisibilityArchivalConfig.ClusterConfiguredForArchival() {
 		archivalEvent, err := d.toArchivalRegisterEvent(
-			registerRequest.VisibilityArchivalStatus,
+			registerRequest.VisibilityArchivalState,
 			registerRequest.GetVisibilityArchivalUri(),
-			clusterVisibilityArchivalConfig.GetNamespaceDefaultStatus(),
+			clusterVisibilityArchivalConfig.GetNamespaceDefaultState(),
 			clusterVisibilityArchivalConfig.GetNamespaceDefaultURI(),
 		)
 		if err != nil {
@@ -203,19 +203,19 @@ func (d *HandlerImpl) RegisterNamespace(
 	info := &persistenceblobs.NamespaceInfo{
 		Id:          uuid.New(),
 		Name:        registerRequest.GetName(),
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Owner:       registerRequest.GetOwnerEmail(),
 		Description: registerRequest.GetDescription(),
 		Data:        registerRequest.Data,
 	}
 	config := &persistenceblobs.NamespaceConfig{
-		RetentionDays:            registerRequest.GetWorkflowExecutionRetentionPeriodInDays(),
-		EmitMetric:               registerRequest.GetEmitMetric(),
-		HistoryArchivalStatus:    nextHistoryArchivalState.Status,
-		HistoryArchivalUri:       nextHistoryArchivalState.URI,
-		VisibilityArchivalStatus: nextVisibilityArchivalState.Status,
-		VisibilityArchivalUri:    nextVisibilityArchivalState.URI,
-		BadBinaries:              &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
+		RetentionDays:           registerRequest.GetWorkflowExecutionRetentionPeriodDays(),
+		EmitMetric:              registerRequest.GetEmitMetric(),
+		HistoryArchivalState:    nextHistoryArchivalState.State,
+		HistoryArchivalUri:      nextHistoryArchivalState.URI,
+		VisibilityArchivalState: nextVisibilityArchivalState.State,
+		VisibilityArchivalUri:   nextVisibilityArchivalState.URI,
+		BadBinaries:             &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}
 	replicationConfig := &persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: activeClusterName,
@@ -380,15 +380,15 @@ func (d *HandlerImpl) UpdateNamespace(
 	isGlobalNamespace := getResponse.IsGlobalNamespace
 
 	currentHistoryArchivalState := &ArchivalState{
-		Status: config.HistoryArchivalStatus,
-		URI:    config.HistoryArchivalUri,
+		State: config.HistoryArchivalState,
+		URI:   config.HistoryArchivalUri,
 	}
 	nextHistoryArchivalState := currentHistoryArchivalState
 	historyArchivalConfigChanged := false
 	clusterHistoryArchivalConfig := d.archivalMetadata.GetHistoryConfig()
 	if updateRequest.Config != nil && clusterHistoryArchivalConfig.ClusterConfiguredForArchival() {
 		cfg := updateRequest.GetConfig()
-		archivalEvent, err := d.toArchivalUpdateEvent(cfg.HistoryArchivalStatus, cfg.GetHistoryArchivalUri(), clusterHistoryArchivalConfig.GetNamespaceDefaultURI())
+		archivalEvent, err := d.toArchivalUpdateEvent(cfg.HistoryArchivalState, cfg.GetHistoryArchivalUri(), clusterHistoryArchivalConfig.GetNamespaceDefaultURI())
 		if err != nil {
 			return nil, err
 		}
@@ -399,15 +399,15 @@ func (d *HandlerImpl) UpdateNamespace(
 	}
 
 	currentVisibilityArchivalState := &ArchivalState{
-		Status: config.VisibilityArchivalStatus,
-		URI:    config.VisibilityArchivalUri,
+		State: config.VisibilityArchivalState,
+		URI:   config.VisibilityArchivalUri,
 	}
 	nextVisibilityArchivalState := currentVisibilityArchivalState
 	visibilityArchivalConfigChanged := false
 	clusterVisibilityArchivalConfig := d.archivalMetadata.GetVisibilityConfig()
 	if updateRequest.Config != nil && clusterVisibilityArchivalConfig.ClusterConfiguredForArchival() {
 		cfg := updateRequest.GetConfig()
-		archivalEvent, err := d.toArchivalUpdateEvent(cfg.VisibilityArchivalStatus, cfg.GetVisibilityArchivalUri(), clusterVisibilityArchivalConfig.GetNamespaceDefaultURI())
+		archivalEvent, err := d.toArchivalUpdateEvent(cfg.VisibilityArchivalState, cfg.GetVisibilityArchivalUri(), clusterVisibilityArchivalConfig.GetNamespaceDefaultURI())
 		if err != nil {
 			return nil, err
 		}
@@ -450,12 +450,12 @@ func (d *HandlerImpl) UpdateNamespace(
 		}
 		if historyArchivalConfigChanged {
 			configurationChanged = true
-			config.HistoryArchivalStatus = nextHistoryArchivalState.Status
+			config.HistoryArchivalState = nextHistoryArchivalState.State
 			config.HistoryArchivalUri = nextHistoryArchivalState.URI
 		}
 		if visibilityArchivalConfigChanged {
 			configurationChanged = true
-			config.VisibilityArchivalStatus = nextVisibilityArchivalState.Status
+			config.VisibilityArchivalState = nextVisibilityArchivalState.State
 			config.VisibilityArchivalUri = nextVisibilityArchivalState.URI
 		}
 		if updatedConfig.BadBinaries != nil {
@@ -608,7 +608,7 @@ func (d *HandlerImpl) DeprecateNamespace(
 	}
 
 	getResponse.Namespace.ConfigVersion = getResponse.Namespace.ConfigVersion + 1
-	getResponse.Namespace.Info.Status = enumspb.NAMESPACE_STATUS_DEPRECATED
+	getResponse.Namespace.Info.State = enumspb.NAMESPACE_STATE_DEPRECATED
 	updateReq := &persistence.UpdateNamespaceRequest{
 		Namespace: &persistenceblobs.NamespaceDetail{
 			Info:                        getResponse.Namespace.Info,
@@ -636,7 +636,7 @@ func (d *HandlerImpl) createResponse(
 
 	infoResult := &namespacepb.NamespaceInfo{
 		Name:        info.Name,
-		Status:      info.Status,
+		State:       info.State,
 		Description: info.Description,
 		OwnerEmail:  info.Owner,
 		Data:        info.Data,
@@ -646,9 +646,9 @@ func (d *HandlerImpl) createResponse(
 	configResult := &namespacepb.NamespaceConfig{
 		EmitMetric:                             &types.BoolValue{Value: config.EmitMetric},
 		WorkflowExecutionRetentionPeriodInDays: config.RetentionDays,
-		HistoryArchivalStatus:                  config.HistoryArchivalStatus,
+		HistoryArchivalState:                   config.HistoryArchivalState,
 		HistoryArchivalUri:                     config.HistoryArchivalUri,
-		VisibilityArchivalStatus:               config.VisibilityArchivalStatus,
+		VisibilityArchivalState:                config.VisibilityArchivalState,
 		VisibilityArchivalUri:                  config.VisibilityArchivalUri,
 		BadBinaries:                            config.BadBinaries,
 	}
@@ -700,19 +700,19 @@ func (d *HandlerImpl) mergeNamespaceData(
 }
 
 func (d *HandlerImpl) toArchivalRegisterEvent(
-	status enumspb.ArchivalStatus,
+	state enumspb.ArchivalState,
 	URI string,
-	defaultStatus enumspb.ArchivalStatus,
+	defaultState enumspb.ArchivalState,
 	defaultURI string,
 ) (*ArchivalEvent, error) {
 
 	event := &ArchivalEvent{
-		status:     status,
+		state:      state,
 		URI:        URI,
 		defaultURI: defaultURI,
 	}
-	if event.status == enumspb.ARCHIVAL_STATUS_UNSPECIFIED {
-		event.status = defaultStatus
+	if event.state == enumspb.ARCHIVAL_STATE_UNSPECIFIED {
+		event.state = defaultState
 	}
 	if err := event.validate(); err != nil {
 		return nil, err
@@ -721,13 +721,13 @@ func (d *HandlerImpl) toArchivalRegisterEvent(
 }
 
 func (d *HandlerImpl) toArchivalUpdateEvent(
-	status enumspb.ArchivalStatus,
+	state enumspb.ArchivalState,
 	URI string,
 	defaultURI string,
 ) (*ArchivalEvent, error) {
 
 	event := &ArchivalEvent{
-		status:     status,
+		state:      state,
 		URI:        URI,
 		defaultURI: defaultURI,
 	}
diff --git a/common/namespace/handler_GlobalNamespaceDisabled_test.go b/common/namespace/handler_GlobalNamespaceDisabled_test.go
index b0e1643b7c2..b937edcab45 100644
--- a/common/namespace/handler_GlobalNamespaceDisabled_test.go
+++ b/common/namespace/handler_GlobalNamespaceDisabled_test.go
@@ -138,15 +138,15 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	isGlobalNamespace := true
 
 	resp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.Error(err)
 	s.IsType(&serviceerror.InvalidArgument{}, err)
@@ -169,15 +169,15 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	isGlobalNamespace := false
 
 	resp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.Error(err)
 	s.IsType(&serviceerror.InvalidArgument{}, err)
@@ -195,8 +195,8 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 
 	retention := int32(1)
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		WorkflowExecutionRetentionPeriodInDays: retention,
+		Name:                                 namespace,
+		WorkflowExecutionRetentionPeriodDays: retention,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -210,7 +210,7 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: "",
 		OwnerEmail:  "",
 		Data:        map[string]string{},
@@ -219,9 +219,9 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: false},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -256,15 +256,15 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	}
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -278,7 +278,7 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		OwnerEmail:  email,
 		Data:        data,
@@ -287,9 +287,9 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestRegisterGetNamespace_
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: emitMetric},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -316,14 +316,14 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_No
 	}
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      s.ClusterMetadata.GetCurrentClusterName(),
-		Data:                                   data,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    s.ClusterMetadata.GetCurrentClusterName(),
+		Data:                                 data,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -334,7 +334,7 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_No
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -343,9 +343,9 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_No
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -385,8 +385,8 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_No
 func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_AllAttrSet() {
 	namespace := s.getRandomNamespace()
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		WorkflowExecutionRetentionPeriodDays: 1,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -416,7 +416,7 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_Al
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -425,9 +425,9 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_Al
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -449,9 +449,9 @@ func (s *namespaceHandlerGlobalNamespaceDisabledSuite) TestUpdateGetNamespace_Al
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		},
diff --git a/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go b/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go
index 9005d8fbe55..4b21e82ce2a 100644
--- a/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go
+++ b/common/namespace/handler_GlobalNamespaceEnabled_MasterCluster_test.go
@@ -139,15 +139,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	isGlobalNamespace := false
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.Error(err)
 	s.IsType(&serviceerror.InvalidArgument{}, err)
@@ -166,9 +166,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 
 	retention := int32(1)
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		WorkflowExecutionRetentionPeriodInDays: retention,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		WorkflowExecutionRetentionPeriodDays: retention,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -182,7 +182,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: "",
 		OwnerEmail:  "",
 		Data:        map[string]string{},
@@ -191,9 +191,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: false},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -228,15 +228,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	}
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -250,7 +250,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		OwnerEmail:  email,
 		Data:        data,
@@ -259,9 +259,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: emitMetric},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -289,15 +289,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 	isGlobalNamespace := false
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      s.ClusterMetadata.GetCurrentClusterName(),
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    s.ClusterMetadata.GetCurrentClusterName(),
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -308,7 +308,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -317,9 +317,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -360,9 +360,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 	namespace := s.getRandomNamespace()
 	isGlobalNamespace := false
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		WorkflowExecutionRetentionPeriodDays: 1,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -385,7 +385,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -394,9 +394,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -418,9 +418,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		},
@@ -465,9 +465,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 
 	retention := int32(1)
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		WorkflowExecutionRetentionPeriodInDays: retention,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		WorkflowExecutionRetentionPeriodDays: retention,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -481,7 +481,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: "",
 		OwnerEmail:  "",
 		Data:        map[string]string{},
@@ -490,9 +490,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: false},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -528,15 +528,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	s.mockProducer.On("Publish", mock.Anything).Return(nil).Once()
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -550,7 +550,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		OwnerEmail:  email,
 		Data:        data,
@@ -559,9 +559,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestRegisterG
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: emitMetric},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -597,15 +597,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 	s.mockProducer.On("Publish", mock.Anything).Return(nil).Twice()
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -616,7 +616,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -625,9 +625,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -683,11 +683,11 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 	s.mockProducer.On("Publish", mock.Anything).Return(nil).Twice()
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		WorkflowExecutionRetentionPeriodDays: 1,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -704,7 +704,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -713,9 +713,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -737,9 +737,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		},
@@ -795,15 +795,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 	s.mockProducer.On("Publish", mock.Anything).Return(nil).Twice()
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      prevActiveClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    prevActiveClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -814,7 +814,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -823,9 +823,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledMasterClusterSuite) TestUpdateGet
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
diff --git a/common/namespace/handler_GlobalNamespaceEnabled_NotMasterCluster_test.go b/common/namespace/handler_GlobalNamespaceEnabled_NotMasterCluster_test.go
index 34037cffd4a..7e6714c9e15 100644
--- a/common/namespace/handler_GlobalNamespaceEnabled_NotMasterCluster_test.go
+++ b/common/namespace/handler_GlobalNamespaceEnabled_NotMasterCluster_test.go
@@ -136,9 +136,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 
 	retention := int32(1)
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		WorkflowExecutionRetentionPeriodInDays: retention,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		WorkflowExecutionRetentionPeriodDays: retention,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -152,7 +152,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: "",
 		OwnerEmail:  "",
 		Data:        map[string]string{},
@@ -161,9 +161,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: false},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -198,15 +198,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	}
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -220,7 +220,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	resp.NamespaceInfo.Id = ""
 	s.Equal(&namespacepb.NamespaceInfo{
 		Name:        namespace,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		OwnerEmail:  email,
 		Data:        data,
@@ -229,9 +229,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	s.Equal(&namespacepb.NamespaceConfig{
 		WorkflowExecutionRetentionPeriodInDays: retention,
 		EmitMetric:                             &types.BoolValue{Value: emitMetric},
-		HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+		HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 		HistoryArchivalUri:                     "",
-		VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+		VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 		VisibilityArchivalUri:                  "",
 		BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}, resp.Config)
@@ -260,15 +260,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 	isGlobalNamespace := false
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      s.ClusterMetadata.GetCurrentClusterName(),
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    s.ClusterMetadata.GetCurrentClusterName(),
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -279,7 +279,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -288,9 +288,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -331,9 +331,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 	namespace := s.getRandomNamespace()
 	isGlobalNamespace := false
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      isGlobalNamespace,
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    isGlobalNamespace,
+		WorkflowExecutionRetentionPeriodDays: 1,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -356,7 +356,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -365,9 +365,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
@@ -389,9 +389,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		},
@@ -471,15 +471,15 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestRegist
 	isGlobalNamespace := true
 
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             email,
-		WorkflowExecutionRetentionPeriodInDays: retention,
-		EmitMetric:                             emitMetric,
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		Data:                                   data,
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           email,
+		WorkflowExecutionRetentionPeriodDays: retention,
+		EmitMetric:                           emitMetric,
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		Data:                                 data,
+		IsGlobalNamespace:                    isGlobalNamespace,
 	})
 	s.Error(err)
 	s.IsType(&serviceerror.InvalidArgument{}, err)
@@ -517,18 +517,18 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          uuid.New(),
 				Name:        namespace,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: description,
 				Owner:       email,
 				Data:        data,
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            retention,
-				EmitMetric:               emitMetric,
-				HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-				HistoryArchivalUri:       "",
-				VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-				VisibilityArchivalUri:    "",
+				RetentionDays:           retention,
+				EmitMetric:              emitMetric,
+				HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+				HistoryArchivalUri:      "",
+				VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+				VisibilityArchivalUri:   "",
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: activeClusterName,
@@ -578,18 +578,18 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          uuid.New(),
 				Name:        namespace,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: "",
 				Owner:       "",
 				Data:        map[string]string{},
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            0,
-				EmitMetric:               false,
-				HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-				HistoryArchivalUri:       "",
-				VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-				VisibilityArchivalUri:    "",
+				RetentionDays:           0,
+				EmitMetric:              false,
+				HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+				HistoryArchivalUri:      "",
+				VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+				VisibilityArchivalUri:   "",
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: activeClusterName,
@@ -612,9 +612,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		},
@@ -658,18 +658,18 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          uuid.New(),
 				Name:        namespace,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: description,
 				Owner:       email,
 				Data:        data,
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            retention,
-				EmitMetric:               emitMetric,
-				HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-				HistoryArchivalUri:       "",
-				VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-				VisibilityArchivalUri:    "",
+				RetentionDays:           retention,
+				EmitMetric:              emitMetric,
+				HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+				HistoryArchivalUri:      "",
+				VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+				VisibilityArchivalUri:   "",
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: prevActiveClusterName,
@@ -688,7 +688,7 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		info.Id = ""
 		s.Equal(&namespacepb.NamespaceInfo{
 			Name:        namespace,
-			Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+			State:       enumspb.NAMESPACE_STATE_REGISTERED,
 			Description: description,
 			OwnerEmail:  email,
 			Data:        data,
@@ -697,9 +697,9 @@ func (s *namespaceHandlerGlobalNamespaceEnabledNotMasterClusterSuite) TestUpdate
 		s.Equal(&namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+			HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 			HistoryArchivalUri:                     "",
-			VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 			VisibilityArchivalUri:                  "",
 			BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 		}, config)
diff --git a/common/namespace/handler_test.go b/common/namespace/handler_test.go
index e14bac4f226..45929c8c96a 100644
--- a/common/namespace/handler_test.go
+++ b/common/namespace/handler_test.go
@@ -279,13 +279,13 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 		})
 	}
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace1,
-		Description:                            description1,
-		OwnerEmail:                             email1,
-		WorkflowExecutionRetentionPeriodInDays: retention1,
-		EmitMetric:                             emitMetric1,
-		Data:                                   data1,
-		IsGlobalNamespace:                      isGlobalNamespace1,
+		Name:                                 namespace1,
+		Description:                          description1,
+		OwnerEmail:                           email1,
+		WorkflowExecutionRetentionPeriodDays: retention1,
+		EmitMetric:                           emitMetric1,
+		Data:                                 data1,
+		IsGlobalNamespace:                    isGlobalNamespace1,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -309,15 +309,15 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 	}
 	s.mockProducer.On("Publish", mock.Anything).Return(nil).Once()
 	registerResp, err = s.handler.RegisterNamespace(context.Background(), &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace2,
-		Description:                            description2,
-		OwnerEmail:                             email2,
-		WorkflowExecutionRetentionPeriodInDays: retention2,
-		EmitMetric:                             emitMetric2,
-		Clusters:                               cluster2,
-		ActiveClusterName:                      activeClusterName2,
-		Data:                                   data2,
-		IsGlobalNamespace:                      isGlobalNamespace2,
+		Name:                                 namespace2,
+		Description:                          description2,
+		OwnerEmail:                           email2,
+		WorkflowExecutionRetentionPeriodDays: retention2,
+		EmitMetric:                           emitMetric2,
+		Clusters:                             cluster2,
+		ActiveClusterName:                    activeClusterName2,
+		Data:                                 data2,
+		IsGlobalNamespace:                    isGlobalNamespace2,
 	})
 	s.NoError(err)
 	s.Nil(registerResp)
@@ -344,7 +344,7 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 		namespace1: &workflowservice.DescribeNamespaceResponse{
 			NamespaceInfo: &namespacepb.NamespaceInfo{
 				Name:        namespace1,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: description1,
 				OwnerEmail:  email1,
 				Data:        data1,
@@ -353,9 +353,9 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 			Config: &namespacepb.NamespaceConfig{
 				WorkflowExecutionRetentionPeriodInDays: retention1,
 				EmitMetric:                             &types.BoolValue{Value: emitMetric1},
-				HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+				HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 				HistoryArchivalUri:                     "",
-				VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+				VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 				VisibilityArchivalUri:                  "",
 				BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 			},
@@ -369,7 +369,7 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 		namespace2: &workflowservice.DescribeNamespaceResponse{
 			NamespaceInfo: &namespacepb.NamespaceInfo{
 				Name:        namespace2,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: description2,
 				OwnerEmail:  email2,
 				Data:        data2,
@@ -378,9 +378,9 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 			Config: &namespacepb.NamespaceConfig{
 				WorkflowExecutionRetentionPeriodInDays: retention2,
 				EmitMetric:                             &types.BoolValue{Value: emitMetric2},
-				HistoryArchivalStatus:                  enumspb.ARCHIVAL_STATUS_DISABLED,
+				HistoryArchivalState:                   enumspb.ARCHIVAL_STATE_DISABLED,
 				HistoryArchivalUri:                     "",
-				VisibilityArchivalStatus:               enumspb.ARCHIVAL_STATUS_DISABLED,
+				VisibilityArchivalState:                enumspb.ARCHIVAL_STATE_DISABLED,
 				VisibilityArchivalUri:                  "",
 				BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 			},
@@ -396,10 +396,10 @@ func (s *namespaceHandlerCommonSuite) TestListNamespace() {
 
 func (s *namespaceHandlerCommonSuite) TestRegisterNamespace_InvalidRetentionPeriod() {
 	registerRequest := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   "random namespace name",
-		Description:                            "random namespace name",
-		WorkflowExecutionRetentionPeriodInDays: int32(0),
-		IsGlobalNamespace:                      false,
+		Name:                                 "random namespace name",
+		Description:                          "random namespace name",
+		WorkflowExecutionRetentionPeriodDays: int32(0),
+		IsGlobalNamespace:                    false,
 	}
 	resp, err := s.handler.RegisterNamespace(context.Background(), registerRequest)
 	s.Equal(errInvalidRetentionPeriod, err)
@@ -409,10 +409,10 @@ func (s *namespaceHandlerCommonSuite) TestRegisterNamespace_InvalidRetentionPeri
 func (s *namespaceHandlerCommonSuite) TestUpdateNamespace_InvalidRetentionPeriod() {
 	namespace := "random namespace name"
 	registerRequest := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            namespace,
-		WorkflowExecutionRetentionPeriodInDays: int32(10),
-		IsGlobalNamespace:                      false,
+		Name:                                 namespace,
+		Description:                          namespace,
+		WorkflowExecutionRetentionPeriodDays: int32(10),
+		IsGlobalNamespace:                    false,
 	}
 	registerResp, err := s.handler.RegisterNamespace(context.Background(), registerRequest)
 	s.NoError(err)
diff --git a/common/namespace/replicationTaskExecutor.go b/common/namespace/replicationTaskExecutor.go
index 1b775b80ad8..5cd004d8a16 100644
--- a/common/namespace/replicationTaskExecutor.go
+++ b/common/namespace/replicationTaskExecutor.go
@@ -55,8 +55,8 @@ var (
 	ErrInvalidNamespaceConfigVersion = serviceerror.NewInvalidArgument("invalid namespace config version attribute")
 	// ErrInvalidNamespaceFailoverVersion is the error to indicate empty failover version attribute
 	ErrInvalidNamespaceFailoverVersion = serviceerror.NewInvalidArgument("invalid namespace failover version attribute")
-	// ErrInvalidNamespaceStatus is the error to indicate invalid namespace status
-	ErrInvalidNamespaceStatus = serviceerror.NewInvalidArgument("invalid namespace status attribute")
+	// ErrInvalidNamespaceState is the error to indicate invalid namespace state
+	ErrInvalidNamespaceState = serviceerror.NewInvalidArgument("invalid namespace state attribute")
 	// ErrNameUUIDCollision is the error to indicate namespace name / UUID collision
 	ErrNameUUIDCollision = serviceerror.NewInvalidArgument("namespace replication encounter name / UUID collision")
 )
@@ -106,7 +106,7 @@ func (h *namespaceReplicationTaskExecutorImpl) Execute(task *replicationspb.Name
 // handleNamespaceCreationReplicationTask handles the namespace creation replication task
 func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceCreationReplicationTask(task *replicationspb.NamespaceTaskAttributes) error {
 	// task already validated
-	err := h.validateNamespaceStatus(task.Info.Status)
+	err := h.validateNamespaceStatus(task.Info.State)
 	if err != nil {
 		return err
 	}
@@ -116,18 +116,18 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceCreationReplicatio
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          task.GetId(),
 				Name:        task.Info.GetName(),
-				Status:      task.Info.Status,
+				State:       task.Info.GetState(),
 				Description: task.Info.GetDescription(),
 				Owner:       task.Info.GetOwnerEmail(),
 				Data:        task.Info.Data,
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            task.Config.GetWorkflowExecutionRetentionPeriodInDays(),
-				EmitMetric:               task.Config.GetEmitMetric().GetValue(),
-				HistoryArchivalStatus:    task.Config.GetHistoryArchivalStatus(),
-				HistoryArchivalUri:       task.Config.GetHistoryArchivalUri(),
-				VisibilityArchivalStatus: task.Config.GetVisibilityArchivalStatus(),
-				VisibilityArchivalUri:    task.Config.GetVisibilityArchivalUri(),
+				RetentionDays:           task.Config.GetWorkflowExecutionRetentionPeriodInDays(),
+				EmitMetric:              task.Config.GetEmitMetric().GetValue(),
+				HistoryArchivalState:    task.Config.GetHistoryArchivalState(),
+				HistoryArchivalUri:      task.Config.GetHistoryArchivalUri(),
+				VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
+				VisibilityArchivalUri:   task.Config.GetVisibilityArchivalUri(),
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: task.ReplicationConfig.GetActiveClusterName(),
@@ -191,7 +191,7 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceCreationReplicatio
 // handleNamespaceUpdateReplicationTask handles the namespace update replication task
 func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceUpdateReplicationTask(task *replicationspb.NamespaceTaskAttributes) error {
 	// task already validated
-	err := h.validateNamespaceStatus(task.Info.Status)
+	err := h.validateNamespaceStatus(task.Info.State)
 	if err != nil {
 		return err
 	}
@@ -228,18 +228,18 @@ func (h *namespaceReplicationTaskExecutorImpl) handleNamespaceUpdateReplicationT
 		request.Namespace.Info = &persistenceblobs.NamespaceInfo{
 			Id:          task.GetId(),
 			Name:        task.Info.GetName(),
-			Status:      task.Info.Status,
+			State:       task.Info.GetState(),
 			Description: task.Info.GetDescription(),
 			Owner:       task.Info.GetOwnerEmail(),
 			Data:        task.Info.Data,
 		}
 		request.Namespace.Config = &persistenceblobs.NamespaceConfig{
-			RetentionDays:            task.Config.GetWorkflowExecutionRetentionPeriodInDays(),
-			EmitMetric:               task.Config.GetEmitMetric().GetValue(),
-			HistoryArchivalStatus:    task.Config.GetHistoryArchivalStatus(),
-			HistoryArchivalUri:       task.Config.GetHistoryArchivalUri(),
-			VisibilityArchivalStatus: task.Config.GetVisibilityArchivalStatus(),
-			VisibilityArchivalUri:    task.Config.GetVisibilityArchivalUri(),
+			RetentionDays:           task.Config.GetWorkflowExecutionRetentionPeriodInDays(),
+			EmitMetric:              task.Config.GetEmitMetric().GetValue(),
+			HistoryArchivalState:    task.Config.GetHistoryArchivalState(),
+			HistoryArchivalUri:      task.Config.GetHistoryArchivalUri(),
+			VisibilityArchivalState: task.Config.GetVisibilityArchivalState(),
+			VisibilityArchivalUri:   task.Config.GetVisibilityArchivalUri(),
 		}
 		if task.Config.GetBadBinaries() != nil {
 			request.Namespace.Config.BadBinaries = task.Config.GetBadBinaries()
@@ -288,11 +288,11 @@ func (h *namespaceReplicationTaskExecutorImpl) convertClusterReplicationConfigFr
 	return output
 }
 
-func (h *namespaceReplicationTaskExecutorImpl) validateNamespaceStatus(input enumspb.NamespaceStatus) error {
+func (h *namespaceReplicationTaskExecutorImpl) validateNamespaceStatus(input enumspb.NamespaceState) error {
 	switch input {
-	case enumspb.NAMESPACE_STATUS_REGISTERED, enumspb.NAMESPACE_STATUS_DEPRECATED:
+	case enumspb.NAMESPACE_STATE_REGISTERED, enumspb.NAMESPACE_STATE_DEPRECATED:
 		return nil
 	default:
-		return ErrInvalidNamespaceStatus
+		return ErrInvalidNamespaceState
 	}
 }
diff --git a/common/namespace/replicationTaskExecutor_test.go b/common/namespace/replicationTaskExecutor_test.go
index 9af16f16a62..c9c0c60b1da 100644
--- a/common/namespace/replicationTaskExecutor_test.go
+++ b/common/namespace/replicationTaskExecutor_test.go
@@ -83,15 +83,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -111,7 +111,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -119,9 +119,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -152,15 +152,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -180,7 +180,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -188,9 +188,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -212,15 +212,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_RegisterNamespaceTas
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_REGISTERED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, resp.Namespace.Info.State)
 	s.Equal(description, resp.Namespace.Info.Description)
 	s.Equal(ownerEmail, resp.Namespace.Info.Owner)
 	s.Equal(data, resp.Namespace.Info.Data)
 	s.Equal(retention, resp.Namespace.Config.RetentionDays)
 	s.Equal(emitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(historyArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(visibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(clusters), resp.Namespace.ReplicationConfig.Clusters)
@@ -238,14 +238,14 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	operation := enumsspb.NAMESPACE_OPERATION_UPDATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -266,7 +266,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        namespaceData,
@@ -274,9 +274,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -298,15 +298,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_REGISTERED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, resp.Namespace.Info.State)
 	s.Equal(description, resp.Namespace.Info.Description)
 	s.Equal(ownerEmail, resp.Namespace.Info.Owner)
 	s.Equal(namespaceData, resp.Namespace.Info.Data)
 	s.Equal(retention, resp.Namespace.Config.RetentionDays)
 	s.Equal(emitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(historyArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(visibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(clusters), resp.Namespace.ReplicationConfig.Clusters)
@@ -320,15 +320,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -348,7 +348,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -356,9 +356,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -374,15 +374,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 
 	// success update case
 	updateOperation := enumsspb.NAMESPACE_OPERATION_UPDATE
-	updateStatus := enumspb.NAMESPACE_STATUS_DEPRECATED
+	updateState := enumspb.NAMESPACE_STATE_DEPRECATED
 	updateDescription := "other random namespace test description"
 	updateOwnerEmail := "other random namespace test owner"
 	updatedData := map[string]string{"k": "v1"}
 	updateRetention := int32(122)
 	updateEmitMetric := true
-	updateHistoryArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	updateHistoryArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	updateHistoryArchivalURI := "some updated history archival uri"
-	updateVisibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	updateVisibilityArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	updateVisibilityArchivalURI := "some updated visibility archival uri"
 	updateClusterActive := "other random active cluster name"
 	updateClusterStandby := "other random standby cluster name"
@@ -401,7 +401,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      updateStatus,
+			State:       updateState,
 			Description: updateDescription,
 			OwnerEmail:  updateOwnerEmail,
 			Data:        updatedData,
@@ -409,9 +409,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: updateRetention,
 			EmitMetric:                             &types.BoolValue{Value: updateEmitMetric},
-			HistoryArchivalStatus:                  updateHistoryArchivalStatus,
+			HistoryArchivalState:                   updateHistoryArchivalState,
 			HistoryArchivalUri:                     updateHistoryArchivalURI,
-			VisibilityArchivalStatus:               updateVisibilityArchivalStatus,
+			VisibilityArchivalState:                updateVisibilityArchivalState,
 			VisibilityArchivalUri:                  updateVisibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -431,15 +431,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_DEPRECATED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_DEPRECATED, resp.Namespace.Info.State)
 	s.Equal(updateDescription, resp.Namespace.Info.Description)
 	s.Equal(updateOwnerEmail, resp.Namespace.Info.Owner)
 	s.Equal(updatedData, resp.Namespace.Info.Data)
 	s.Equal(updateRetention, resp.Namespace.Config.RetentionDays)
 	s.Equal(updateEmitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(updateHistoryArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(updateHistoryArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(updateHistoryArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(updateVisibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(updateVisibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(updateVisibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(updateClusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(updateClusters), resp.Namespace.ReplicationConfig.Clusters)
@@ -453,15 +453,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	historyArchivalURI := ""
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	visibilityArchivalURI := ""
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -481,7 +481,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -489,9 +489,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -507,15 +507,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 
 	// success update case
 	updateOperation := enumsspb.NAMESPACE_OPERATION_UPDATE
-	updateStatus := enumspb.NAMESPACE_STATUS_DEPRECATED
+	updateState := enumspb.NAMESPACE_STATE_DEPRECATED
 	updateDescription := "other random namespace test description"
 	updateOwnerEmail := "other random namespace test owner"
 	updateData := map[string]string{"k": "v2"}
 	updateRetention := int32(122)
 	updateEmitMetric := true
-	updateHistoryArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	updateHistoryArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	updateHistoryArchivalURI := "some updated history archival uri"
-	updateVisibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	updateVisibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	updateVisibilityArchivalURI := "some updated visibility archival uri"
 	updateClusterActive := "other random active cluster name"
 	updateClusterStandby := "other random standby cluster name"
@@ -534,7 +534,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      updateStatus,
+			State:       updateState,
 			Description: updateDescription,
 			OwnerEmail:  updateOwnerEmail,
 			Data:        updateData,
@@ -542,9 +542,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: updateRetention,
 			EmitMetric:                             &types.BoolValue{Value: updateEmitMetric},
-			HistoryArchivalStatus:                  updateHistoryArchivalStatus,
+			HistoryArchivalState:                   updateHistoryArchivalState,
 			HistoryArchivalUri:                     updateHistoryArchivalURI,
-			VisibilityArchivalStatus:               updateVisibilityArchivalStatus,
+			VisibilityArchivalState:                updateVisibilityArchivalState,
 			VisibilityArchivalUri:                  updateVisibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -564,15 +564,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_DEPRECATED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_DEPRECATED, resp.Namespace.Info.State)
 	s.Equal(updateDescription, resp.Namespace.Info.Description)
 	s.Equal(updateOwnerEmail, resp.Namespace.Info.Owner)
 	s.Equal(updateData, resp.Namespace.Info.Data)
 	s.Equal(updateRetention, resp.Namespace.Config.RetentionDays)
 	s.Equal(updateEmitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(updateHistoryArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(updateHistoryArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(updateHistoryArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(updateVisibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(updateVisibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(updateVisibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(updateClusters), resp.Namespace.ReplicationConfig.Clusters)
@@ -586,15 +586,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -614,7 +614,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -622,9 +622,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -640,7 +640,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 
 	// success update case
 	updateOperation := enumsspb.NAMESPACE_OPERATION_UPDATE
-	updateStatus := enumspb.NAMESPACE_STATUS_DEPRECATED
+	updateState := enumspb.NAMESPACE_STATE_DEPRECATED
 	updateDescription := "other random namespace test description"
 	updateOwnerEmail := "other random namespace test owner"
 	updatedData := map[string]string{"k": "v2"}
@@ -663,7 +663,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      updateStatus,
+			State:       updateState,
 			Description: updateDescription,
 			OwnerEmail:  updateOwnerEmail,
 			Data:        updatedData,
@@ -671,9 +671,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: updateRetention,
 			EmitMetric:                             &types.BoolValue{Value: updateEmitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -693,15 +693,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_REGISTERED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, resp.Namespace.Info.State)
 	s.Equal(description, resp.Namespace.Info.Description)
 	s.Equal(ownerEmail, resp.Namespace.Info.Owner)
 	s.Equal(data, resp.Namespace.Info.Data)
 	s.Equal(retention, resp.Namespace.Config.RetentionDays)
 	s.Equal(emitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(historyArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(visibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(updateClusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(clusters), resp.Namespace.ReplicationConfig.Clusters)
@@ -715,15 +715,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	operation := enumsspb.NAMESPACE_OPERATION_CREATE
 	id := uuid.New()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -743,7 +743,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			OwnerEmail:  ownerEmail,
 			Data:        data,
@@ -751,9 +751,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retention,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -771,7 +771,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 
 	// success update case
 	updateOperation := enumsspb.NAMESPACE_OPERATION_UPDATE
-	updateStatus := enumspb.NAMESPACE_STATUS_DEPRECATED
+	updateState := enumspb.NAMESPACE_STATE_DEPRECATED
 	updateDescription := "other random namespace test description"
 	updateOwnerEmail := "other random namespace test owner"
 	updatedData := map[string]string{"k": "v2"}
@@ -794,7 +794,7 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Id:                 id,
 		Info: &namespacepb.NamespaceInfo{
 			Name:        name,
-			Status:      updateStatus,
+			State:       updateState,
 			Description: updateDescription,
 			OwnerEmail:  updateOwnerEmail,
 			Data:        updatedData,
@@ -802,9 +802,9 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 		Config: &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: updateRetention,
 			EmitMetric:                             &types.BoolValue{Value: updateEmitMetric},
-			HistoryArchivalStatus:                  historyArchivalStatus,
+			HistoryArchivalState:                   historyArchivalState,
 			HistoryArchivalUri:                     historyArchivalURI,
-			VisibilityArchivalStatus:               visibilityArchivalStatus,
+			VisibilityArchivalState:                visibilityArchivalState,
 			VisibilityArchivalUri:                  visibilityArchivalURI,
 		},
 		ReplicationConfig: &replicationpb.NamespaceReplicationConfig{
@@ -821,15 +821,15 @@ func (s *namespaceReplicationTaskExecutorSuite) TestExecute_UpdateNamespaceTask_
 	s.NotNil(resp)
 	s.EqualValues(id, resp.Namespace.Info.Id)
 	s.Equal(name, resp.Namespace.Info.Name)
-	s.Equal(enumspb.NAMESPACE_STATUS_REGISTERED, resp.Namespace.Info.Status)
+	s.Equal(enumspb.NAMESPACE_STATE_REGISTERED, resp.Namespace.Info.State)
 	s.Equal(description, resp.Namespace.Info.Description)
 	s.Equal(ownerEmail, resp.Namespace.Info.Owner)
 	s.Equal(data, resp.Namespace.Info.Data)
 	s.Equal(retention, resp.Namespace.Config.RetentionDays)
 	s.Equal(emitMetric, resp.Namespace.Config.EmitMetric)
-	s.Equal(historyArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	s.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	s.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	s.Equal(visibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	s.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	s.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	s.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
 	s.Equal(s.namespaceReplicator.convertClusterReplicationConfigFromProto(clusters), resp.Namespace.ReplicationConfig.Clusters)
diff --git a/common/namespace/transmissionTaskHandler.go b/common/namespace/transmissionTaskHandler.go
index 075f94539d2..817b9372a5d 100644
--- a/common/namespace/transmissionTaskHandler.go
+++ b/common/namespace/transmissionTaskHandler.go
@@ -78,7 +78,7 @@ func (namespaceReplicator *namespaceReplicatorImpl) HandleTransmissionTask(names
 			Id:                 info.Id,
 			Info: &namespacepb.NamespaceInfo{
 				Name:        info.Name,
-				Status:      info.Status,
+				State:       info.State,
 				Description: info.Description,
 				OwnerEmail:  info.Owner,
 				Data:        info.Data,
@@ -86,9 +86,9 @@ func (namespaceReplicator *namespaceReplicatorImpl) HandleTransmissionTask(names
 			Config: &namespacepb.NamespaceConfig{
 				WorkflowExecutionRetentionPeriodInDays: config.RetentionDays,
 				EmitMetric:                             &types.BoolValue{Value: config.EmitMetric},
-				HistoryArchivalStatus:                  config.HistoryArchivalStatus,
+				HistoryArchivalState:                   config.HistoryArchivalState,
 				HistoryArchivalUri:                     config.HistoryArchivalUri,
-				VisibilityArchivalStatus:               config.VisibilityArchivalStatus,
+				VisibilityArchivalState:                config.VisibilityArchivalState,
 				VisibilityArchivalUri:                  config.VisibilityArchivalUri,
 				BadBinaries:                            config.BadBinaries,
 			},
diff --git a/common/namespace/transmissionTaskHandler_test.go b/common/namespace/transmissionTaskHandler_test.go
index 5959e910542..3fee5f13cf4 100644
--- a/common/namespace/transmissionTaskHandler_test.go
+++ b/common/namespace/transmissionTaskHandler_test.go
@@ -77,15 +77,15 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 	taskType := enumsspb.REPLICATION_TASK_TYPE_NAMESPACE_TASK
 	id := primitives.NewUUID().String()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -97,19 +97,19 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 	info := &persistenceblobs.NamespaceInfo{
 		Id:          id,
 		Name:        name,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		Owner:       ownerEmail,
 		Data:        data,
 	}
 	config := &persistenceblobs.NamespaceConfig{
-		RetentionDays:            retention,
-		EmitMetric:               emitMetric,
-		HistoryArchivalStatus:    historyArchivalStatus,
-		HistoryArchivalUri:       historyArchivalURI,
-		VisibilityArchivalStatus: visibilityArchivalStatus,
-		VisibilityArchivalUri:    visibilityArchivalURI,
-		BadBinaries:              &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
+		RetentionDays:           retention,
+		EmitMetric:              emitMetric,
+		HistoryArchivalState:    historyArchivalState,
+		HistoryArchivalUri:      historyArchivalURI,
+		VisibilityArchivalState: visibilityArchivalState,
+		VisibilityArchivalUri:   visibilityArchivalURI,
+		BadBinaries:             &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}
 	replicationConfig := &persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: clusterActive,
@@ -125,7 +125,7 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 				Id:                 id,
 				Info: &namespacepb.NamespaceInfo{
 					Name:        name,
-					Status:      status,
+					State:       state,
 					Description: description,
 					OwnerEmail:  ownerEmail,
 					Data:        data,
@@ -133,9 +133,9 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 				Config: &namespacepb.NamespaceConfig{
 					WorkflowExecutionRetentionPeriodInDays: retention,
 					EmitMetric:                             &types.BoolValue{Value: emitMetric},
-					HistoryArchivalStatus:                  historyArchivalStatus,
+					HistoryArchivalState:                   historyArchivalState,
 					HistoryArchivalUri:                     historyArchivalURI,
-					VisibilityArchivalStatus:               visibilityArchivalStatus,
+					VisibilityArchivalState:                visibilityArchivalState,
 					VisibilityArchivalUri:                  visibilityArchivalURI,
 					BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 				},
@@ -161,9 +161,9 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -175,19 +175,19 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_RegisterNamespaceTask
 	info := &persistenceblobs.NamespaceInfo{
 		Id:          id,
 		Name:        name,
-		Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+		State:       enumspb.NAMESPACE_STATE_REGISTERED,
 		Description: description,
 		Owner:       ownerEmail,
 		Data:        data,
 	}
 	config := &persistenceblobs.NamespaceConfig{
-		RetentionDays:            retention,
-		EmitMetric:               emitMetric,
-		HistoryArchivalStatus:    historyArchivalStatus,
-		HistoryArchivalUri:       historyArchivalURI,
-		VisibilityArchivalStatus: visibilityArchivalStatus,
-		VisibilityArchivalUri:    visibilityArchivalURI,
-		BadBinaries:              &namespacepb.BadBinaries{},
+		RetentionDays:           retention,
+		EmitMetric:              emitMetric,
+		HistoryArchivalState:    historyArchivalState,
+		HistoryArchivalUri:      historyArchivalURI,
+		VisibilityArchivalState: visibilityArchivalState,
+		VisibilityArchivalUri:   visibilityArchivalURI,
+		BadBinaries:             &namespacepb.BadBinaries{},
 	}
 	replicationConfig := &persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: clusterActive,
@@ -203,15 +203,15 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_I
 	taskType := enumsspb.REPLICATION_TASK_TYPE_NAMESPACE_TASK
 	id := primitives.NewUUID().String()
 	name := "some random namespace test name"
-	status := enumspb.NAMESPACE_STATUS_DEPRECATED
+	state := enumspb.NAMESPACE_STATE_DEPRECATED
 	description := "some random test description"
 	ownerEmail := "some random test owner"
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -223,19 +223,19 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_I
 	info := &persistenceblobs.NamespaceInfo{
 		Id:          id,
 		Name:        name,
-		Status:      enumspb.NAMESPACE_STATUS_DEPRECATED,
+		State:       enumspb.NAMESPACE_STATE_DEPRECATED,
 		Description: description,
 		Owner:       ownerEmail,
 		Data:        data,
 	}
 	config := &persistenceblobs.NamespaceConfig{
-		RetentionDays:            retention,
-		EmitMetric:               emitMetric,
-		HistoryArchivalStatus:    historyArchivalStatus,
-		HistoryArchivalUri:       historyArchivalURI,
-		VisibilityArchivalStatus: visibilityArchivalStatus,
-		VisibilityArchivalUri:    visibilityArchivalURI,
-		BadBinaries:              &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
+		RetentionDays:           retention,
+		EmitMetric:              emitMetric,
+		HistoryArchivalState:    historyArchivalState,
+		HistoryArchivalUri:      historyArchivalURI,
+		VisibilityArchivalState: visibilityArchivalState,
+		VisibilityArchivalUri:   visibilityArchivalURI,
+		BadBinaries:             &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 	}
 	replicationConfig := &persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: clusterActive,
@@ -251,7 +251,7 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_I
 				Id:                 id,
 				Info: &namespacepb.NamespaceInfo{
 					Name:        name,
-					Status:      status,
+					State:       state,
 					Description: description,
 					OwnerEmail:  ownerEmail,
 					Data:        data,
@@ -259,9 +259,9 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_I
 				Config: &namespacepb.NamespaceConfig{
 					WorkflowExecutionRetentionPeriodInDays: retention,
 					EmitMetric:                             &types.BoolValue{Value: emitMetric},
-					HistoryArchivalStatus:                  historyArchivalStatus,
+					HistoryArchivalState:                   historyArchivalState,
 					HistoryArchivalUri:                     historyArchivalURI,
-					VisibilityArchivalStatus:               visibilityArchivalStatus,
+					VisibilityArchivalState:                visibilityArchivalState,
 					VisibilityArchivalUri:                  visibilityArchivalURI,
 					BadBinaries:                            &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 				},
@@ -286,9 +286,9 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_N
 	data := map[string]string{"k": "v"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "some random history archival uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "some random visibility archival uri"
 	clusterActive := "some random active cluster name"
 	clusterStandby := "some random standby cluster name"
@@ -300,18 +300,18 @@ func (s *transmissionTaskSuite) TestHandleTransmissionTask_UpdateNamespaceTask_N
 	info := &persistenceblobs.NamespaceInfo{
 		Id:          id,
 		Name:        name,
-		Status:      enumspb.NAMESPACE_STATUS_DEPRECATED,
+		State:       enumspb.NAMESPACE_STATE_DEPRECATED,
 		Description: description,
 		Owner:       ownerEmail,
 		Data:        data,
 	}
 	config := &persistenceblobs.NamespaceConfig{
-		RetentionDays:            retention,
-		EmitMetric:               emitMetric,
-		HistoryArchivalStatus:    historyArchivalStatus,
-		HistoryArchivalUri:       historyArchivalURI,
-		VisibilityArchivalStatus: visibilityArchivalStatus,
-		VisibilityArchivalUri:    visibilityArchivalURI,
+		RetentionDays:           retention,
+		EmitMetric:              emitMetric,
+		HistoryArchivalState:    historyArchivalState,
+		HistoryArchivalUri:      historyArchivalURI,
+		VisibilityArchivalState: visibilityArchivalState,
+		VisibilityArchivalUri:   visibilityArchivalURI,
 	}
 	replicationConfig := &persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: clusterActive,
diff --git a/common/persistence/cassandra/cassandraPersistence.go b/common/persistence/cassandra/cassandraPersistence.go
index fca0b311e30..4177e99d3cb 100644
--- a/common/persistence/cassandra/cassandraPersistence.go
+++ b/common/persistence/cassandra/cassandraPersistence.go
@@ -782,7 +782,7 @@ func (d *cassandraPersistence) GetShardID() int {
 
 func (d *cassandraPersistence) CreateShard(request *p.CreateShardRequest) error {
 	shardInfo := request.ShardInfo
-	shardInfo.UpdatedAt = types.TimestampNow()
+	shardInfo.UpdateTime = types.TimestampNow()
 	data, err := serialization.ShardInfoToBlob(shardInfo)
 
 	if err != nil {
@@ -849,7 +849,7 @@ func (d *cassandraPersistence) GetShard(request *p.GetShardRequest) (*p.GetShard
 
 func (d *cassandraPersistence) UpdateShard(request *p.UpdateShardRequest) error {
 	shardInfo := request.ShardInfo
-	shardInfo.UpdatedAt = types.TimestampNow()
+	shardInfo.UpdateTime = types.TimestampNow()
 	data, err := serialization.ShardInfoToBlob(shardInfo)
 
 	if err != nil {
@@ -1385,7 +1385,7 @@ func (d *cassandraPersistence) UpdateWorkflowExecution(request *p.InternalUpdate
 	return nil
 }
 
-//TODO: update query with version histories
+// TODO: update query with version histories
 func (d *cassandraPersistence) ResetWorkflowExecution(request *p.InternalResetWorkflowExecutionRequest) error {
 
 	batch := d.session.NewBatch(gocql.LoggedBatch)
@@ -1484,7 +1484,7 @@ func (d *cassandraPersistence) ResetWorkflowExecution(request *p.InternalResetWo
 		return err
 	}
 
-	//Verifies that the RangeID has not changed
+	// Verifies that the RangeID has not changed
 	batch.Query(templateUpdateLeaseQuery,
 		request.RangeID,
 		d.shardID,
@@ -2246,13 +2246,13 @@ func (d *cassandraPersistence) LeaseTaskQueue(request *p.LeaseTaskQueueRequest)
 		if err == gocql.ErrNotFound { // First time task queue is used
 			tl = &p.PersistedTaskQueueInfo{
 				Data: &persistenceblobs.TaskQueueInfo{
-					NamespaceId: request.NamespaceID,
-					Name:        request.TaskQueue,
-					TaskType:    request.TaskType,
-					Kind:        request.TaskQueueKind,
-					AckLevel:    0,
-					Expiry:      nil,
-					LastUpdated: now,
+					NamespaceId:    request.NamespaceID,
+					Name:           request.TaskQueue,
+					TaskType:       request.TaskType,
+					Kind:           request.TaskQueueKind,
+					AckLevel:       0,
+					ExpiryTime:     nil,
+					LastUpdateTime: now,
 				},
 				RangeID: initialRangeID,
 			}
@@ -2293,7 +2293,7 @@ func (d *cassandraPersistence) LeaseTaskQueue(request *p.LeaseTaskQueueRequest)
 			return nil, serviceerror.NewInternal(fmt.Sprintf("LeaseTaskQueue operation failed during serialization. TaskQueue: %v, TaskType: %v, Error: %v", request.TaskQueue, request.TaskType, err))
 		}
 
-		tli.LastUpdated = now
+		tli.LastUpdateTime = now
 		tl = &p.PersistedTaskQueueInfo{
 			Data:    tli,
 			RangeID: rangeID + 1,
@@ -2338,7 +2338,7 @@ func (d *cassandraPersistence) LeaseTaskQueue(request *p.LeaseTaskQueueRequest)
 // From TaskManager interface
 func (d *cassandraPersistence) UpdateTaskQueue(request *p.UpdateTaskQueueRequest) (*p.UpdateTaskQueueResponse, error) {
 	tli := *request.TaskQueueInfo
-	tli.LastUpdated = types.TimestampNow()
+	tli.LastUpdateTime = types.TimestampNow()
 	if tli.Kind == enumspb.TASK_QUEUE_KIND_STICKY { // if task_queue is sticky, then update with TTL
 		expiry := types.TimestampNow()
 		expiry.Seconds += int64(stickyTaskQueueTTL)
@@ -2367,7 +2367,7 @@ func (d *cassandraPersistence) UpdateTaskQueue(request *p.UpdateTaskQueueRequest
 		return &p.UpdateTaskQueueResponse{}, nil
 	}
 
-	tli.LastUpdated = types.TimestampNow()
+	tli.LastUpdateTime = types.TimestampNow()
 	datablob, err := serialization.TaskQueueInfoToBlob(&tli)
 	if err != nil {
 		return nil, convertCommonErrors("UpdateTaskQueue", err)
@@ -2480,7 +2480,7 @@ func (d *cassandraPersistence) CreateTasks(request *p.CreateTasksRequest) (*p.Cr
 	}
 
 	tl := *request.TaskQueueInfo.Data
-	tl.LastUpdated = types.TimestampNow()
+	tl.LastUpdateTime = types.TimestampNow()
 	datablob, err := serialization.TaskQueueInfoToBlob(&tl)
 
 	if err != nil {
@@ -2521,10 +2521,10 @@ func (d *cassandraPersistence) CreateTasks(request *p.CreateTasksRequest) (*p.Cr
 
 func GetTaskTTL(task *persistenceblobs.TaskInfo) int64 {
 	var ttl int64 = 0
-	if task.Expiry != nil {
+	if task.ExpiryTime != nil {
 		// Ignoring error since err is just validating 0 < yyyy < 1000 and nanos < 1e9
 		// and we'd have checked this upstream
-		expiryGo, _ := types.TimestampFromProto(task.Expiry)
+		expiryGo, _ := types.TimestampFromProto(task.ExpiryTime)
 		expiryTtl := convert.Int64Ceil(expiryGo.Sub(time.Now()).Seconds())
 		ttl = expiryTtl
 	}
diff --git a/common/persistence/cassandra/cassandraPersistenceUtil.go b/common/persistence/cassandra/cassandraPersistenceUtil.go
index 4d0bb0797fd..b694fdf2ffb 100644
--- a/common/persistence/cassandra/cassandraPersistenceUtil.go
+++ b/common/persistence/cassandra/cassandraPersistenceUtil.go
@@ -446,7 +446,7 @@ func createExecution(
 
 	// TODO we should set the start time and last update time on business logic layer
 	executionInfo.StartTimestamp = time.Unix(0, p.DBTimestampToUnixNano(cqlNowTimestampMillis))
-	executionInfo.LastUpdatedTimestamp = time.Unix(0, p.DBTimestampToUnixNano(cqlNowTimestampMillis))
+	executionInfo.LastUpdateTimestamp = time.Unix(0, p.DBTimestampToUnixNano(cqlNowTimestampMillis))
 
 	protoExecution, protoState, err := p.InternalWorkflowExecutionInfoToProto(executionInfo, startVersion, currentVersion, replicationState, versionHistories)
 	if err != nil {
@@ -558,7 +558,7 @@ func updateExecution(
 	runID := executionInfo.RunID
 
 	// TODO we should set the last update time on business logic layer
-	executionInfo.LastUpdatedTimestamp = time.Unix(0, p.DBTimestampToUnixNano(cqlNowTimestampMillis))
+	executionInfo.LastUpdateTimestamp = time.Unix(0, p.DBTimestampToUnixNano(cqlNowTimestampMillis))
 
 	protoExecution, protoState, err := p.InternalWorkflowExecutionInfoToProto(executionInfo, startVersion, currentVersion, replicationState, versionHistories)
 	if err != nil {
@@ -773,7 +773,7 @@ func createTransferTasks(
 			ScheduleId:              scheduleID,
 			Version:                 task.GetVersion(),
 			TaskId:                  task.GetTaskID(),
-			VisibilityTimestamp:     taskVisTs,
+			VisibilityTime:          taskVisTs,
 			RecordVisibility:        recordVisibility,
 		}
 
@@ -809,7 +809,7 @@ func createReplicationTasks(
 		// Replication task specific information
 		firstEventID := common.EmptyEventID
 		nextEventID := common.EmptyEventID
-		version := common.EmptyVersion //nolint:ineffassign
+		version := common.EmptyVersion // nolint:ineffassign
 		var lastReplicationInfo map[string]*replicationspb.ReplicationInfo
 		activityScheduleID := common.EmptyEventID
 		var branchToken, newRunBranchToken []byte
@@ -944,7 +944,7 @@ func createTimerTasks(
 			ScheduleAttempt:     attempt,
 			EventId:             eventID,
 			TaskId:              task.GetTaskID(),
-			VisibilityTimestamp: protoTs,
+			VisibilityTime:      protoTs,
 		})
 
 		if err != nil {
diff --git a/common/persistence/dataInterfaces.go b/common/persistence/dataInterfaces.go
index 1d3aee6513a..798618b3257 100644
--- a/common/persistence/dataInterfaces.go
+++ b/common/persistence/dataInterfaces.go
@@ -1535,7 +1535,7 @@ func (a *ActivityTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *ActivityTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1570,12 +1570,12 @@ func (d *DecisionTask) SetTaskID(id int64) {
 	d.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
-func (d *ReplicationTaskInfoWrapper) GetVisibilityTimestamp() *types.Timestamp {
+// GetVisibilityTime get the visibility timestamp
+func (d *ReplicationTaskInfoWrapper) GetVisibilityTime() *types.Timestamp {
 	return &types.Timestamp{}
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (d *DecisionTask) GetVisibilityTimestamp() time.Time {
 	return d.VisibilityTimestamp
 }
@@ -1610,7 +1610,7 @@ func (a *RecordWorkflowStartedTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *RecordWorkflowStartedTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1645,7 +1645,7 @@ func (a *ResetWorkflowTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *ResetWorkflowTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1680,7 +1680,7 @@ func (a *CloseExecutionTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *CloseExecutionTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1715,7 +1715,7 @@ func (a *DeleteHistoryEventTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *DeleteHistoryEventTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1750,7 +1750,7 @@ func (d *DecisionTimeoutTask) SetTaskID(id int64) {
 	d.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (d *DecisionTimeoutTask) GetVisibilityTimestamp() time.Time {
 	return d.VisibilityTimestamp
 }
@@ -1785,7 +1785,7 @@ func (a *ActivityTimeoutTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (a *ActivityTimeoutTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -1820,7 +1820,7 @@ func (u *UserTimerTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (u *UserTimerTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -1855,7 +1855,7 @@ func (r *ActivityRetryTimerTask) SetTaskID(id int64) {
 	r.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (r *ActivityRetryTimerTask) GetVisibilityTimestamp() time.Time {
 	return r.VisibilityTimestamp
 }
@@ -1890,7 +1890,7 @@ func (r *WorkflowBackoffTimerTask) SetTaskID(id int64) {
 	r.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (r *WorkflowBackoffTimerTask) GetVisibilityTimestamp() time.Time {
 	return r.VisibilityTimestamp
 }
@@ -1925,7 +1925,7 @@ func (u *WorkflowTimeoutTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp gets the visibility time stamp
+// GetVisibilityTime gets the visibility time stamp
 func (u *WorkflowTimeoutTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -1960,7 +1960,7 @@ func (u *CancelExecutionTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (u *CancelExecutionTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -1995,7 +1995,7 @@ func (u *SignalExecutionTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (u *SignalExecutionTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -2030,7 +2030,7 @@ func (u *UpsertWorkflowSearchAttributesTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (u *UpsertWorkflowSearchAttributesTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -2065,7 +2065,7 @@ func (u *StartChildExecutionTask) SetTaskID(id int64) {
 	u.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (u *StartChildExecutionTask) GetVisibilityTimestamp() time.Time {
 	return u.VisibilityTimestamp
 }
@@ -2100,7 +2100,7 @@ func (a *HistoryReplicationTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *HistoryReplicationTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
@@ -2135,7 +2135,7 @@ func (a *SyncActivityTask) SetTaskID(id int64) {
 	a.TaskID = id
 }
 
-// GetVisibilityTimestamp get the visibility timestamp
+// GetVisibilityTime get the visibility timestamp
 func (a *SyncActivityTask) GetVisibilityTimestamp() time.Time {
 	return a.VisibilityTimestamp
 }
diff --git a/common/persistence/executionStore.go b/common/persistence/executionStore.go
index 9f4d5f5be6f..f04933df166 100644
--- a/common/persistence/executionStore.go
+++ b/common/persistence/executionStore.go
@@ -150,7 +150,7 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
 		NextEventID:                        info.NextEventID,
 		LastProcessedEvent:                 info.LastProcessedEvent,
 		StartTimestamp:                     info.StartTimestamp,
-		LastUpdatedTimestamp:               info.LastUpdatedTimestamp,
+		LastUpdatedTimestamp:               info.LastUpdateTimestamp,
 		CreateRequestID:                    info.CreateRequestID,
 		SignalCount:                        info.SignalCount,
 		DecisionVersion:                    info.DecisionVersion,
@@ -272,7 +272,7 @@ func (m *executionManagerImpl) DeserializeActivityInfos(
 			HeartbeatTimeout:                        v.HeartbeatTimeout,
 			CancelRequested:                         v.CancelRequested,
 			CancelRequestID:                         v.CancelRequestID,
-			LastHeartBeatUpdatedTime:                v.LastHeartBeatUpdatedTime,
+			LastHeartBeatUpdatedTime:                v.LastHeartbeatUpdateTime,
 			TimerTaskStatus:                         v.TimerTaskStatus,
 			Attempt:                                 v.Attempt,
 			NamespaceID:                             v.NamespaceID,
@@ -392,7 +392,7 @@ func (m *executionManagerImpl) SerializeUpsertActivityInfos(
 			HeartbeatTimeout:                        v.HeartbeatTimeout,
 			CancelRequested:                         v.CancelRequested,
 			CancelRequestID:                         v.CancelRequestID,
-			LastHeartBeatUpdatedTime:                v.LastHeartBeatUpdatedTime,
+			LastHeartbeatUpdateTime:                 v.LastHeartBeatUpdatedTime,
 			TimerTaskStatus:                         v.TimerTaskStatus,
 			Attempt:                                 v.Attempt,
 			NamespaceID:                             v.NamespaceID,
@@ -455,7 +455,7 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
 		NextEventID:                        info.NextEventID,
 		LastProcessedEvent:                 info.LastProcessedEvent,
 		StartTimestamp:                     info.StartTimestamp,
-		LastUpdatedTimestamp:               info.LastUpdatedTimestamp,
+		LastUpdateTimestamp:                info.LastUpdatedTimestamp,
 		CreateRequestID:                    info.CreateRequestID,
 		SignalCount:                        info.SignalCount,
 		DecisionVersion:                    info.DecisionVersion,
diff --git a/common/persistence/metadataStore.go b/common/persistence/metadataStore.go
index dc7e990a88b..09f9738979b 100644
--- a/common/persistence/metadataStore.go
+++ b/common/persistence/metadataStore.go
@@ -154,15 +154,15 @@ func (m *metadataManagerImpl) InitializeSystemNamespaces(currentClusterName stri
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          common.SystemNamespaceID,
 				Name:        common.SystemLocalNamespace,
-				Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+				State:       enumspb.NAMESPACE_STATE_REGISTERED,
 				Description: "Temporal internal system namespace",
 				Owner:       "temporal-core@temporal.io",
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            common.SystemNamespaceRetentionDays,
-				HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-				VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-				EmitMetric:               true,
+				RetentionDays:           common.SystemNamespaceRetentionDays,
+				HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+				VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+				EmitMetric:              true,
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: currentClusterName,
diff --git a/common/persistence/persistence-tests/executionManagerTest.go b/common/persistence/persistence-tests/executionManagerTest.go
index fb3d58fcf95..7580dc5f3aa 100644
--- a/common/persistence/persistence-tests/executionManagerTest.go
+++ b/common/persistence/persistence-tests/executionManagerTest.go
@@ -2307,7 +2307,7 @@ func (s *ExecutionManagerSuite) TestTransferTasksComplete() {
 	s.NotNil(txTasks, "expected valid list of tasks.")
 	s.Equal(len(tasks), len(txTasks))
 	for index := range tasks {
-		t, err := types.TimestampFromProto(txTasks[index].VisibilityTimestamp)
+		t, err := types.TimestampFromProto(txTasks[index].VisibilityTime)
 		s.NoError(err)
 		s.True(timeComparatorGo(tasks[index].GetVisibilityTimestamp(), t, TimePrecision))
 	}
@@ -2404,7 +2404,7 @@ func (s *ExecutionManagerSuite) TestTransferTasksRangeComplete() {
 	s.NotNil(txTasks, "expected valid list of tasks.")
 	s.Equal(len(tasks), len(txTasks))
 	for index := range tasks {
-		t, err := types.TimestampFromProto(txTasks[index].VisibilityTimestamp)
+		t, err := types.TimestampFromProto(txTasks[index].VisibilityTime)
 		s.NoError(err)
 		s.True(timeComparatorGo(tasks[index].GetVisibilityTimestamp(), t, TimePrecision))
 	}
@@ -2483,9 +2483,9 @@ func (s *ExecutionManagerSuite) TestTimerTasksComplete() {
 	s.Equal(int64(14), timerTasks[3].Version)
 	s.Equal(int64(15), timerTasks[4].Version)
 
-	visTimer0, err := types.TimestampFromProto(timerTasks[0].VisibilityTimestamp)
+	visTimer0, err := types.TimestampFromProto(timerTasks[0].VisibilityTime)
 	s.NoError(err)
-	visTimer4, err := types.TimestampFromProto(timerTasks[4].VisibilityTimestamp)
+	visTimer4, err := types.TimestampFromProto(timerTasks[4].VisibilityTime)
 	s.NoError(err)
 	visTimer4 = visTimer4.Add(1 * time.Second)
 	err2 = s.RangeCompleteTimerTask(visTimer0, visTimer4)
@@ -2545,19 +2545,19 @@ func (s *ExecutionManagerSuite) TestTimerTasksRangeComplete() {
 	err2 = s.UpdateWorkflowExecution(updatedInfo, updatedStats, nil, nil, nil, int64(5), nil, nil, nil, nil, nil)
 	s.NoError(err2)
 
-	err2 = s.CompleteTimerTaskProto(timerTasks[0].VisibilityTimestamp, timerTasks[0].GetTaskId())
+	err2 = s.CompleteTimerTaskProto(timerTasks[0].VisibilityTime, timerTasks[0].GetTaskId())
 	s.NoError(err2)
 
-	err2 = s.CompleteTimerTaskProto(timerTasks[1].VisibilityTimestamp, timerTasks[1].GetTaskId())
+	err2 = s.CompleteTimerTaskProto(timerTasks[1].VisibilityTime, timerTasks[1].GetTaskId())
 	s.NoError(err2)
 
-	err2 = s.CompleteTimerTaskProto(timerTasks[2].VisibilityTimestamp, timerTasks[2].GetTaskId())
+	err2 = s.CompleteTimerTaskProto(timerTasks[2].VisibilityTime, timerTasks[2].GetTaskId())
 	s.NoError(err2)
 
-	err2 = s.CompleteTimerTaskProto(timerTasks[3].VisibilityTimestamp, timerTasks[3].GetTaskId())
+	err2 = s.CompleteTimerTaskProto(timerTasks[3].VisibilityTime, timerTasks[3].GetTaskId())
 	s.NoError(err2)
 
-	err2 = s.CompleteTimerTaskProto(timerTasks[4].VisibilityTimestamp, timerTasks[4].GetTaskId())
+	err2 = s.CompleteTimerTaskProto(timerTasks[4].VisibilityTime, timerTasks[4].GetTaskId())
 	s.NoError(err2)
 
 	timerTasks2, err2 := s.GetTimerIndexTasks(100, false)
@@ -5117,10 +5117,10 @@ func (s *ExecutionManagerSuite) TestCreateGetShardBackfill() {
 		Owner:                   "some random owner",
 		RangeId:                 rangeID,
 		StolenSinceRenew:        12,
-		UpdatedAt:               timestampConvertor(time.Now()),
+		UpdateTime:              timestampConvertor(time.Now()),
 		ReplicationAckLevel:     currentReplicationAck,
 		TransferAckLevel:        currentClusterTransferAck,
-		TimerAckLevel:           currentClusterTimerAck,
+		TimerAckLevelTime:       currentClusterTimerAck,
 		ClusterReplicationLevel: map[string]int64{},
 		ReplicationDlqAckLevel:  map[string]int64{},
 	}
@@ -5137,13 +5137,13 @@ func (s *ExecutionManagerSuite) TestCreateGetShardBackfill() {
 	}
 	resp, err := s.ShardMgr.GetShard(&p.GetShardRequest{ShardID: shardID})
 	s.NoError(err)
-	s.True(timeComparator(shardInfo.UpdatedAt, resp.ShardInfo.UpdatedAt, TimePrecision))
+	s.True(timeComparator(shardInfo.UpdateTime, resp.ShardInfo.UpdateTime, TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], TimePrecision))
-	s.Equal(shardInfo.TimerAckLevel.Nanos, resp.ShardInfo.TimerAckLevel.Nanos)
-	s.Equal(shardInfo.TimerAckLevel.Seconds, resp.ShardInfo.TimerAckLevel.Seconds)
-	resp.ShardInfo.TimerAckLevel = shardInfo.TimerAckLevel
-	resp.ShardInfo.UpdatedAt = shardInfo.UpdatedAt
+	s.Equal(shardInfo.TimerAckLevelTime.Nanos, resp.ShardInfo.TimerAckLevelTime.Nanos)
+	s.Equal(shardInfo.TimerAckLevelTime.Seconds, resp.ShardInfo.TimerAckLevelTime.Seconds)
+	resp.ShardInfo.TimerAckLevelTime = shardInfo.TimerAckLevelTime
+	resp.ShardInfo.UpdateTime = shardInfo.UpdateTime
 	resp.ShardInfo.ClusterTimerAckLevel = shardInfo.ClusterTimerAckLevel
 	s.Equal(shardInfo, resp.ShardInfo)
 }
@@ -5165,10 +5165,10 @@ func (s *ExecutionManagerSuite) TestCreateGetUpdateGetShard() {
 		Owner:               "some random owner",
 		RangeId:             rangeID,
 		StolenSinceRenew:    12,
-		UpdatedAt:           timestampConvertor(time.Now()),
+		UpdateTime:          timestampConvertor(time.Now()),
 		ReplicationAckLevel: currentReplicationAck,
 		TransferAckLevel:    currentClusterTransferAck,
-		TimerAckLevel:       currentClusterTimerAck,
+		TimerAckLevelTime:   currentClusterTimerAck,
 		ClusterTransferAckLevel: map[string]int64{
 			cluster.TestCurrentClusterName:     currentClusterTransferAck,
 			cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -5187,13 +5187,13 @@ func (s *ExecutionManagerSuite) TestCreateGetUpdateGetShard() {
 	s.Nil(s.ShardMgr.CreateShard(createRequest))
 	resp, err := s.ShardMgr.GetShard(&p.GetShardRequest{ShardID: shardID})
 	s.NoError(err)
-	s.True(timeComparator(shardInfo.UpdatedAt, resp.ShardInfo.UpdatedAt, TimePrecision))
+	s.True(timeComparator(shardInfo.UpdateTime, resp.ShardInfo.UpdateTime, TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], TimePrecision))
-	s.Equal(shardInfo.TimerAckLevel.Nanos, resp.ShardInfo.TimerAckLevel.Nanos)
-	s.Equal(shardInfo.TimerAckLevel.Seconds, resp.ShardInfo.TimerAckLevel.Seconds)
-	resp.ShardInfo.TimerAckLevel = shardInfo.TimerAckLevel
-	resp.ShardInfo.UpdatedAt = shardInfo.UpdatedAt
+	s.Equal(shardInfo.TimerAckLevelTime.Nanos, resp.ShardInfo.TimerAckLevelTime.Nanos)
+	s.Equal(shardInfo.TimerAckLevelTime.Seconds, resp.ShardInfo.TimerAckLevelTime.Seconds)
+	resp.ShardInfo.TimerAckLevelTime = shardInfo.TimerAckLevelTime
+	resp.ShardInfo.UpdateTime = shardInfo.UpdateTime
 	resp.ShardInfo.ClusterTimerAckLevel = shardInfo.ClusterTimerAckLevel
 	s.Equal(shardInfo, resp.ShardInfo)
 
@@ -5209,10 +5209,10 @@ func (s *ExecutionManagerSuite) TestCreateGetUpdateGetShard() {
 		Owner:               "some random owner",
 		RangeId:             int64(28),
 		StolenSinceRenew:    4,
-		UpdatedAt:           timestampConvertor(time.Now()),
+		UpdateTime:          timestampConvertor(time.Now()),
 		ReplicationAckLevel: currentReplicationAck,
 		TransferAckLevel:    currentClusterTransferAck,
-		TimerAckLevel:       currentClusterTimerAck,
+		TimerAckLevelTime:   currentClusterTimerAck,
 		ClusterTransferAckLevel: map[string]int64{
 			cluster.TestCurrentClusterName:     currentClusterTransferAck,
 			cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -5233,13 +5233,13 @@ func (s *ExecutionManagerSuite) TestCreateGetUpdateGetShard() {
 
 	resp, err = s.ShardMgr.GetShard(&p.GetShardRequest{ShardID: shardID})
 	s.NoError(err)
-	s.True(timeComparator(shardInfo.UpdatedAt, resp.ShardInfo.UpdatedAt, TimePrecision))
+	s.True(timeComparator(shardInfo.UpdateTime, resp.ShardInfo.UpdateTime, TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestCurrentClusterName], TimePrecision))
 	s.True(timeComparator(shardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], resp.ShardInfo.ClusterTimerAckLevel[cluster.TestAlternativeClusterName], TimePrecision))
-	s.Equal(shardInfo.TimerAckLevel.Nanos, resp.ShardInfo.TimerAckLevel.Nanos)
-	s.Equal(shardInfo.TimerAckLevel.Seconds, resp.ShardInfo.TimerAckLevel.Seconds)
-	resp.ShardInfo.UpdatedAt = shardInfo.UpdatedAt
-	resp.ShardInfo.TimerAckLevel = shardInfo.TimerAckLevel
+	s.Equal(shardInfo.TimerAckLevelTime.Nanos, resp.ShardInfo.TimerAckLevelTime.Nanos)
+	s.Equal(shardInfo.TimerAckLevelTime.Seconds, resp.ShardInfo.TimerAckLevelTime.Seconds)
+	resp.ShardInfo.UpdateTime = shardInfo.UpdateTime
+	resp.ShardInfo.TimerAckLevelTime = shardInfo.TimerAckLevelTime
 	resp.ShardInfo.ClusterTimerAckLevel = shardInfo.ClusterTimerAckLevel
 	s.Equal(shardInfo, resp.ShardInfo)
 }
diff --git a/common/persistence/persistence-tests/executionManagerTestForEventsV2.go b/common/persistence/persistence-tests/executionManagerTestForEventsV2.go
index 648f8d7a44d..29ed47f4c9a 100644
--- a/common/persistence/persistence-tests/executionManagerTestForEventsV2.go
+++ b/common/persistence/persistence-tests/executionManagerTestForEventsV2.go
@@ -734,7 +734,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
 	taskT, err := s.GetTimerIndexTasks(2, false)
 	s.Equal(1, len(taskT), "Expected 1 timer task.")
 	s.EqualValues(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[0].TaskType)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
@@ -959,11 +959,11 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetWithCurrWithReplicat
 	s.Equal(2, len(taskT), "Expected 2 timer task.")
 	s.EqualValues(enumsspb.TASK_TYPE_DELETE_HISTORY_EVENT, taskT[0].TaskType)
 	s.Equal(int64(101), taskT[0].Version)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	s.EqualValues(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[1].TaskType)
 	s.Equal(int64(201), taskT[1].Version)
-	err = s.CompleteTimerTaskProto(taskT[1].VisibilityTimestamp, taskT[1].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[1].VisibilityTime, taskT[1].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
@@ -1166,7 +1166,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
 	taskT, err := s.GetTimerIndexTasks(2, false)
 	s.Equal(1, len(taskT), "Expected 1 timer task.")
 	s.EqualValues(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[0].TaskType)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
@@ -1371,7 +1371,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrWithReplicate(
 	s.Equal(1, len(taskT), "Expected 1 timer task.")
 	s.EqualValues(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[0].TaskType)
 	s.Equal(int64(201), taskT[0].Version)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
@@ -1540,7 +1540,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
 	taskT, err := s.GetTimerIndexTasks(2, false)
 	s.Equal(1, len(taskT), "Expected 1 timer task.")
 	s.Equal(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[0].TaskType)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
@@ -1638,7 +1638,7 @@ func (s *ExecutionManagerSuiteForEventsV2) TestWorkflowResetNoCurrNoReplicate()
 	s.Equal(1, len(taskT), "Expected 1 timer task.")
 	s.EqualValues(enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT, taskT[0].TaskType)
 	s.Equal(int64(201), taskT[0].Version)
-	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTimestamp, taskT[0].GetTaskId())
+	err = s.CompleteTimerTaskProto(taskT[0].VisibilityTime, taskT[0].GetTaskId())
 	s.NoError(err)
 	taskT, err = s.GetTimerIndexTasks(2, false)
 	s.Equal(0, len(taskT), "Expected 0 timer task.")
diff --git a/common/persistence/persistence-tests/matchingPersistenceTest.go b/common/persistence/persistence-tests/matchingPersistenceTest.go
index 40f29f97759..b5a9f182807 100644
--- a/common/persistence/persistence-tests/matchingPersistenceTest.go
+++ b/common/persistence/persistence-tests/matchingPersistenceTest.go
@@ -112,9 +112,9 @@ func (s *MatchingPersistenceSuite) TestCreateTask() {
 		s.Equal(workflowExecution.WorkflowId, resp.Tasks[0].Data.GetWorkflowId())
 		s.EqualValues(workflowExecution.RunId, resp.Tasks[0].Data.GetRunId())
 		s.Equal(sid, resp.Tasks[0].Data.GetScheduleId())
-		cTime, err := types.TimestampFromProto(resp.Tasks[0].Data.CreatedTime)
+		cTime, err := types.TimestampFromProto(resp.Tasks[0].Data.CreateTime)
 		s.NoError(err)
-		eTime, err := types.TimestampFromProto(resp.Tasks[0].Data.Expiry)
+		eTime, err := types.TimestampFromProto(resp.Tasks[0].Data.ExpiryTime)
 		s.NoError(err)
 		s.True(cTime.UnixNano() > 0)
 		if s.TaskMgr.GetName() != "cassandra" {
@@ -313,7 +313,7 @@ func (s *MatchingPersistenceSuite) TestLeaseAndUpdateTaskQueue() {
 	tli := response.TaskQueueInfo
 	s.EqualValues(1, tli.RangeID)
 	s.EqualValues(0, tli.Data.AckLevel)
-	lu, err := types.TimestampFromProto(tli.Data.LastUpdated)
+	lu, err := types.TimestampFromProto(tli.Data.LastUpdateTime)
 	s.NoError(err)
 	s.True(lu.After(leaseTime) || lu.Equal(leaseTime))
 
@@ -328,7 +328,7 @@ func (s *MatchingPersistenceSuite) TestLeaseAndUpdateTaskQueue() {
 	s.NotNil(tli)
 	s.EqualValues(2, tli.RangeID)
 	s.EqualValues(0, tli.Data.AckLevel)
-	lu2, err := types.TimestampFromProto(tli.Data.LastUpdated)
+	lu2, err := types.TimestampFromProto(tli.Data.LastUpdateTime)
 	s.NoError(err)
 	s.True(lu2.After(leaseTime) || lu2.Equal(leaseTime))
 
@@ -452,7 +452,7 @@ func (s *MatchingPersistenceSuite) TestListWithOneTaskQueue() {
 		s.EqualValues(enumspb.TASK_QUEUE_KIND_STICKY, resp.Items[0].Data.Kind)
 		s.Equal(rangeID, resp.Items[0].RangeID)
 		s.Equal(ackLevel, resp.Items[0].Data.AckLevel)
-		lu0, err := types.TimestampFromProto(resp.Items[0].Data.LastUpdated)
+		lu0, err := types.TimestampFromProto(resp.Items[0].Data.LastUpdateTime)
 		s.NoError(err)
 		s.True(lu0.After(updatedTime) || lu0.Equal(updatedTime))
 
@@ -469,7 +469,7 @@ func (s *MatchingPersistenceSuite) TestListWithOneTaskQueue() {
 		resp, err = s.TaskMgr.ListTaskQueue(&p.ListTaskQueueRequest{PageSize: 10})
 		s.NoError(err)
 		s.Equal(1, len(resp.Items))
-		lu0, err = types.TimestampFromProto(resp.Items[0].Data.LastUpdated)
+		lu0, err = types.TimestampFromProto(resp.Items[0].Data.LastUpdateTime)
 		s.NoError(err)
 		s.True(lu0.After(updatedTime) || lu0.Equal(updatedTime))
 	}
diff --git a/common/persistence/persistence-tests/metadataPersistenceV2Test.go b/common/persistence/persistence-tests/metadataPersistenceV2Test.go
index 41601dd905b..862180bbcba 100644
--- a/common/persistence/persistence-tests/metadataPersistenceV2Test.go
+++ b/common/persistence/persistence-tests/metadataPersistenceV2Test.go
@@ -99,15 +99,15 @@ func (m *MetadataPersistenceSuiteV2) TearDownSuite() {
 func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() {
 	id := uuid.New()
 	name := "create-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "create-namespace-test-description"
 	owner := "create-namespace-test-owner"
 	data := map[string]string{"k1": "v1"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 	badBinaries := &namespacepb.BadBinaries{map[string]*namespacepb.BadBinaryInfo{}}
 	isGlobalNamespace := false
@@ -118,19 +118,19 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            retention,
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
-			BadBinaries:              badBinaries,
+			RetentionDays:           retention,
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
+			BadBinaries:             badBinaries,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{},
 		isGlobalNamespace,
@@ -148,15 +148,15 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() {
 	m.NotNil(resp1)
 	m.EqualValues(id, resp1.Namespace.Info.Id)
 	m.Equal(name, resp1.Namespace.Info.Name)
-	m.Equal(status, resp1.Namespace.Info.Status)
+	m.Equal(state, resp1.Namespace.Info.State)
 	m.Equal(description, resp1.Namespace.Info.Description)
 	m.Equal(owner, resp1.Namespace.Info.Owner)
 	m.Equal(data, resp1.Namespace.Info.Data)
 	m.Equal(retention, resp1.Namespace.Config.RetentionDays)
 	m.Equal(emitMetric, resp1.Namespace.Config.EmitMetric)
-	m.Equal(historyArchivalStatus, resp1.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(historyArchivalState, resp1.Namespace.Config.HistoryArchivalState)
 	m.Equal(historyArchivalURI, resp1.Namespace.Config.HistoryArchivalUri)
-	m.Equal(visibilityArchivalStatus, resp1.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(visibilityArchivalState, resp1.Namespace.Config.VisibilityArchivalState)
 	m.Equal(visibilityArchivalURI, resp1.Namespace.Config.VisibilityArchivalUri)
 	m.Equal(badBinaries, resp1.Namespace.Config.BadBinaries)
 	m.Equal(cluster.TestCurrentClusterName, resp1.Namespace.ReplicationConfig.ActiveClusterName)
@@ -171,18 +171,18 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          uuid.New(),
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: "fail",
 			Owner:       "fail",
 			Data:        map[string]string{},
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            100,
-			EmitMetric:               false,
-			HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-			HistoryArchivalUri:       "",
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-			VisibilityArchivalUri:    "",
+			RetentionDays:           100,
+			EmitMetric:              false,
+			HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+			HistoryArchivalUri:      "",
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+			VisibilityArchivalUri:   "",
 		},
 		&persistenceblobs.NamespaceReplicationConfig{},
 		isGlobalNamespace,
@@ -198,15 +198,15 @@ func (m *MetadataPersistenceSuiteV2) TestCreateNamespace() {
 func (m *MetadataPersistenceSuiteV2) TestGetNamespace() {
 	id := uuid.New()
 	name := "get-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "get-namespace-test-description"
 	owner := "get-namespace-test-owner"
 	data := map[string]string{"k1": "v1"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 
 	clusterActive := "some random active cluster name"
@@ -234,19 +234,19 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            retention,
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
-			BadBinaries:              testBinaries,
+			RetentionDays:           retention,
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
+			BadBinaries:             testBinaries,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: clusterActive,
@@ -265,15 +265,15 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() {
 	m.NotNil(resp2)
 	m.EqualValues(id, resp2.Namespace.Info.Id)
 	m.Equal(name, resp2.Namespace.Info.Name)
-	m.Equal(status, resp2.Namespace.Info.Status)
+	m.Equal(state, resp2.Namespace.Info.State)
 	m.Equal(description, resp2.Namespace.Info.Description)
 	m.Equal(owner, resp2.Namespace.Info.Owner)
 	m.Equal(data, resp2.Namespace.Info.Data)
 	m.Equal(retention, resp2.Namespace.Config.RetentionDays)
 	m.Equal(emitMetric, resp2.Namespace.Config.EmitMetric)
-	m.Equal(historyArchivalStatus, resp2.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(historyArchivalState, resp2.Namespace.Config.HistoryArchivalState)
 	m.Equal(historyArchivalURI, resp2.Namespace.Config.HistoryArchivalUri)
-	m.Equal(visibilityArchivalStatus, resp2.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(visibilityArchivalState, resp2.Namespace.Config.VisibilityArchivalState)
 	m.Equal(visibilityArchivalURI, resp2.Namespace.Config.VisibilityArchivalUri)
 	m.True(reflect.DeepEqual(testBinaries, resp2.Namespace.Config.BadBinaries))
 	m.Equal(clusterActive, resp2.Namespace.ReplicationConfig.ActiveClusterName)
@@ -291,15 +291,15 @@ func (m *MetadataPersistenceSuiteV2) TestGetNamespace() {
 	m.NotNil(resp3)
 	m.EqualValues(id, resp3.Namespace.Info.Id)
 	m.Equal(name, resp3.Namespace.Info.Name)
-	m.Equal(status, resp3.Namespace.Info.Status)
+	m.Equal(state, resp3.Namespace.Info.State)
 	m.Equal(description, resp3.Namespace.Info.Description)
 	m.Equal(owner, resp3.Namespace.Info.Owner)
 	m.Equal(data, resp3.Namespace.Info.Data)
 	m.Equal(retention, resp3.Namespace.Config.RetentionDays)
 	m.Equal(emitMetric, resp3.Namespace.Config.EmitMetric)
-	m.Equal(historyArchivalStatus, resp3.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState)
 	m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri)
-	m.Equal(visibilityArchivalStatus, resp3.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState)
 	m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri)
 	m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName)
 	m.Equal(len(clusters), len(resp3.Namespace.ReplicationConfig.Clusters))
@@ -326,14 +326,14 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() {
 	id := uuid.New()
 
 	name := "concurrent-create-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "concurrent-create-namespace-test-description"
 	owner := "create-namespace-test-owner"
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 
 	clusterActive := "some random active cluster name"
@@ -363,19 +363,19 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() {
 				&persistenceblobs.NamespaceInfo{
 					Id:          id,
 					Name:        name,
-					Status:      status,
+					State:       state,
 					Description: description,
 					Owner:       owner,
 					Data:        data,
 				},
 				&persistenceblobs.NamespaceConfig{
-					RetentionDays:            retention,
-					EmitMetric:               emitMetric,
-					HistoryArchivalStatus:    historyArchivalStatus,
-					HistoryArchivalUri:       historyArchivalURI,
-					VisibilityArchivalStatus: visibilityArchivalStatus,
-					VisibilityArchivalUri:    visibilityArchivalURI,
-					BadBinaries:              testBinaries,
+					RetentionDays:           retention,
+					EmitMetric:              emitMetric,
+					HistoryArchivalState:    historyArchivalState,
+					HistoryArchivalUri:      historyArchivalURI,
+					VisibilityArchivalState: visibilityArchivalState,
+					VisibilityArchivalUri:   visibilityArchivalURI,
+					BadBinaries:             testBinaries,
 				},
 				&persistenceblobs.NamespaceReplicationConfig{
 					ActiveClusterName: clusterActive,
@@ -398,14 +398,14 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() {
 	m.NoError(err3)
 	m.NotNil(resp)
 	m.Equal(name, resp.Namespace.Info.Name)
-	m.Equal(status, resp.Namespace.Info.Status)
+	m.Equal(state, resp.Namespace.Info.State)
 	m.Equal(description, resp.Namespace.Info.Description)
 	m.Equal(owner, resp.Namespace.Info.Owner)
 	m.Equal(retention, resp.Namespace.Config.RetentionDays)
 	m.Equal(emitMetric, resp.Namespace.Config.EmitMetric)
-	m.Equal(historyArchivalStatus, resp.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(historyArchivalState, resp.Namespace.Config.HistoryArchivalState)
 	m.Equal(historyArchivalURI, resp.Namespace.Config.HistoryArchivalUri)
-	m.Equal(visibilityArchivalStatus, resp.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(visibilityArchivalState, resp.Namespace.Config.VisibilityArchivalState)
 	m.Equal(visibilityArchivalURI, resp.Namespace.Config.VisibilityArchivalUri)
 	m.True(reflect.DeepEqual(testBinaries, resp.Namespace.Config.BadBinaries))
 	m.Equal(clusterActive, resp.Namespace.ReplicationConfig.ActiveClusterName)
@@ -417,7 +417,7 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() {
 	m.Equal(configVersion, resp.Namespace.ConfigVersion)
 	m.Equal(failoverVersion, resp.Namespace.FailoverVersion)
 
-	//check namespace data
+	// check namespace data
 	ss := strings.Split(resp.Namespace.Info.Data["k0"], "-")
 	m.Equal(2, len(ss))
 	vi, err := strconv.Atoi(ss[1])
@@ -429,15 +429,15 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentCreateNamespace() {
 func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 	id := uuid.New()
 	name := "concurrent-update-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "update-namespace-test-description"
 	owner := "update-namespace-test-owner"
 	data := map[string]string{"k1": "v1"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 	badBinaries := &namespacepb.BadBinaries{map[string]*namespacepb.BadBinaryInfo{}}
 
@@ -452,19 +452,19 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            retention,
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
-			BadBinaries:              badBinaries,
+			RetentionDays:           retention,
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
+			BadBinaries:             badBinaries,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: clusterActive,
@@ -504,19 +504,19 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 				&persistenceblobs.NamespaceInfo{
 					Id:          resp2.Namespace.Info.Id,
 					Name:        resp2.Namespace.Info.Name,
-					Status:      resp2.Namespace.Info.Status,
+					State:       resp2.Namespace.Info.State,
 					Description: resp2.Namespace.Info.Description,
 					Owner:       resp2.Namespace.Info.Owner,
 					Data:        updatedData,
 				},
 				&persistenceblobs.NamespaceConfig{
-					RetentionDays:            resp2.Namespace.Config.RetentionDays,
-					EmitMetric:               resp2.Namespace.Config.EmitMetric,
-					HistoryArchivalStatus:    resp2.Namespace.Config.HistoryArchivalStatus,
-					HistoryArchivalUri:       resp2.Namespace.Config.HistoryArchivalUri,
-					VisibilityArchivalStatus: resp2.Namespace.Config.VisibilityArchivalStatus,
-					VisibilityArchivalUri:    resp2.Namespace.Config.VisibilityArchivalUri,
-					BadBinaries:              testBinaries,
+					RetentionDays:           resp2.Namespace.Config.RetentionDays,
+					EmitMetric:              resp2.Namespace.Config.EmitMetric,
+					HistoryArchivalState:    resp2.Namespace.Config.HistoryArchivalState,
+					HistoryArchivalUri:      resp2.Namespace.Config.HistoryArchivalUri,
+					VisibilityArchivalState: resp2.Namespace.Config.VisibilityArchivalState,
+					VisibilityArchivalUri:   resp2.Namespace.Config.VisibilityArchivalUri,
+					BadBinaries:             testBinaries,
 				},
 				&persistenceblobs.NamespaceReplicationConfig{
 					ActiveClusterName: resp2.Namespace.ReplicationConfig.ActiveClusterName,
@@ -542,16 +542,16 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 	m.NotNil(resp3)
 	m.EqualValues(id, resp3.Namespace.Info.Id)
 	m.Equal(name, resp3.Namespace.Info.Name)
-	m.Equal(status, resp3.Namespace.Info.Status)
+	m.Equal(state, resp3.Namespace.Info.State)
 	m.Equal(isGlobalNamespace, resp3.IsGlobalNamespace)
 	m.Equal(description, resp3.Namespace.Info.Description)
 	m.Equal(owner, resp3.Namespace.Info.Owner)
 
 	m.Equal(retention, resp3.Namespace.Config.RetentionDays)
 	m.Equal(emitMetric, resp3.Namespace.Config.EmitMetric)
-	m.Equal(historyArchivalStatus, resp3.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(historyArchivalState, resp3.Namespace.Config.HistoryArchivalState)
 	m.Equal(historyArchivalURI, resp3.Namespace.Config.HistoryArchivalUri)
-	m.Equal(visibilityArchivalStatus, resp3.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(visibilityArchivalState, resp3.Namespace.Config.VisibilityArchivalState)
 	m.Equal(visibilityArchivalURI, resp3.Namespace.Config.VisibilityArchivalUri)
 	m.True(reflect.DeepEqual(testBinaries, resp3.Namespace.Config.BadBinaries))
 	m.Equal(clusterActive, resp3.Namespace.ReplicationConfig.ActiveClusterName)
@@ -563,7 +563,7 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 	m.Equal(configVersion, resp3.Namespace.ConfigVersion)
 	m.Equal(failoverVersion, resp3.Namespace.FailoverVersion)
 
-	//check namespace data
+	// check namespace data
 	ss := strings.Split(resp3.Namespace.Info.Data["k0"], "-")
 	m.Equal(2, len(ss))
 	vi, err := strconv.Atoi(ss[1])
@@ -575,15 +575,15 @@ func (m *MetadataPersistenceSuiteV2) TestConcurrentUpdateNamespace() {
 func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 	id := uuid.New()
 	name := "update-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "update-namespace-test-description"
 	owner := "update-namespace-test-owner"
 	data := map[string]string{"k1": "v1"}
 	retention := int32(10)
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 
 	clusterActive := "some random active cluster name"
@@ -598,18 +598,18 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            retention,
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
+			RetentionDays:           retention,
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: clusterActive,
@@ -628,16 +628,16 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 	m.NoError(err)
 	notificationVersion := metadata.NotificationVersion
 
-	updatedStatus := enumspb.NAMESPACE_STATUS_DEPRECATED
+	updatedState := enumspb.NAMESPACE_STATE_DEPRECATED
 	updatedDescription := "description-updated"
 	updatedOwner := "owner-updated"
-	//This will overriding the previous key-value pair
+	// This will overriding the previous key-value pair
 	updatedData := map[string]string{"k1": "v2"}
 	updatedRetention := int32(20)
 	updatedEmitMetric := false
-	updatedHistoryArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	updatedHistoryArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	updatedHistoryArchivalURI := ""
-	updatedVisibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_DISABLED
+	updatedVisibilityArchivalState := enumspb.ARCHIVAL_STATE_DISABLED
 	updatedVisibilityArchivalURI := ""
 
 	updateClusterActive := "other random active cluster name"
@@ -661,19 +661,19 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          resp2.Namespace.Info.Id,
 			Name:        resp2.Namespace.Info.Name,
-			Status:      updatedStatus,
+			State:       updatedState,
 			Description: updatedDescription,
 			Owner:       updatedOwner,
 			Data:        updatedData,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            updatedRetention,
-			EmitMetric:               updatedEmitMetric,
-			HistoryArchivalStatus:    updatedHistoryArchivalStatus,
-			HistoryArchivalUri:       updatedHistoryArchivalURI,
-			VisibilityArchivalStatus: updatedVisibilityArchivalStatus,
-			VisibilityArchivalUri:    updatedVisibilityArchivalURI,
-			BadBinaries:              testBinaries,
+			RetentionDays:           updatedRetention,
+			EmitMetric:              updatedEmitMetric,
+			HistoryArchivalState:    updatedHistoryArchivalState,
+			HistoryArchivalUri:      updatedHistoryArchivalURI,
+			VisibilityArchivalState: updatedVisibilityArchivalState,
+			VisibilityArchivalUri:   updatedVisibilityArchivalURI,
+			BadBinaries:             testBinaries,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: updateClusterActive,
@@ -693,15 +693,15 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 	m.EqualValues(id, resp4.Namespace.Info.Id)
 	m.Equal(name, resp4.Namespace.Info.Name)
 	m.Equal(isGlobalNamespace, resp4.IsGlobalNamespace)
-	m.Equal(updatedStatus, resp4.Namespace.Info.Status)
+	m.Equal(updatedState, resp4.Namespace.Info.State)
 	m.Equal(updatedDescription, resp4.Namespace.Info.Description)
 	m.Equal(updatedOwner, resp4.Namespace.Info.Owner)
 	m.Equal(updatedData, resp4.Namespace.Info.Data)
 	m.Equal(updatedRetention, resp4.Namespace.Config.RetentionDays)
 	m.Equal(updatedEmitMetric, resp4.Namespace.Config.EmitMetric)
-	m.Equal(updatedHistoryArchivalStatus, resp4.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(updatedHistoryArchivalState, resp4.Namespace.Config.HistoryArchivalState)
 	m.Equal(updatedHistoryArchivalURI, resp4.Namespace.Config.HistoryArchivalUri)
-	m.Equal(updatedVisibilityArchivalStatus, resp4.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(updatedVisibilityArchivalState, resp4.Namespace.Config.VisibilityArchivalState)
 	m.Equal(updatedVisibilityArchivalURI, resp4.Namespace.Config.VisibilityArchivalUri)
 	m.True(reflect.DeepEqual(testBinaries, resp4.Namespace.Config.BadBinaries))
 	m.Equal(updateClusterActive, resp4.Namespace.ReplicationConfig.ActiveClusterName)
@@ -721,15 +721,15 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 	m.EqualValues(id, resp5.Namespace.Info.Id)
 	m.Equal(name, resp5.Namespace.Info.Name)
 	m.Equal(isGlobalNamespace, resp5.IsGlobalNamespace)
-	m.Equal(updatedStatus, resp5.Namespace.Info.Status)
+	m.Equal(updatedState, resp5.Namespace.Info.State)
 	m.Equal(updatedDescription, resp5.Namespace.Info.Description)
 	m.Equal(updatedOwner, resp5.Namespace.Info.Owner)
 	m.Equal(updatedData, resp5.Namespace.Info.Data)
 	m.Equal(updatedRetention, resp5.Namespace.Config.RetentionDays)
 	m.Equal(updatedEmitMetric, resp5.Namespace.Config.EmitMetric)
-	m.Equal(updatedHistoryArchivalStatus, resp5.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(updatedHistoryArchivalState, resp5.Namespace.Config.HistoryArchivalState)
 	m.Equal(updatedHistoryArchivalURI, resp5.Namespace.Config.HistoryArchivalUri)
-	m.Equal(updatedVisibilityArchivalStatus, resp5.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(updatedVisibilityArchivalState, resp5.Namespace.Config.VisibilityArchivalState)
 	m.Equal(updatedVisibilityArchivalURI, resp5.Namespace.Config.VisibilityArchivalUri)
 	m.Equal(updateClusterActive, resp5.Namespace.ReplicationConfig.ActiveClusterName)
 	m.Equal(len(updateClusters), len(resp5.Namespace.ReplicationConfig.Clusters))
@@ -747,19 +747,19 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          resp2.Namespace.Info.Id,
 			Name:        resp2.Namespace.Info.Name,
-			Status:      updatedStatus,
+			State:       updatedState,
 			Description: updatedDescription,
 			Owner:       updatedOwner,
 			Data:        updatedData,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            updatedRetention,
-			EmitMetric:               updatedEmitMetric,
-			HistoryArchivalStatus:    updatedHistoryArchivalStatus,
-			HistoryArchivalUri:       updatedHistoryArchivalURI,
-			VisibilityArchivalStatus: updatedVisibilityArchivalStatus,
-			VisibilityArchivalUri:    updatedVisibilityArchivalURI,
-			BadBinaries:              testBinaries,
+			RetentionDays:           updatedRetention,
+			EmitMetric:              updatedEmitMetric,
+			HistoryArchivalState:    updatedHistoryArchivalState,
+			HistoryArchivalUri:      updatedHistoryArchivalURI,
+			VisibilityArchivalState: updatedVisibilityArchivalState,
+			VisibilityArchivalUri:   updatedVisibilityArchivalURI,
+			BadBinaries:             testBinaries,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: updateClusterActive,
@@ -779,15 +779,15 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 	m.EqualValues(id, resp6.Namespace.Info.Id)
 	m.Equal(name, resp6.Namespace.Info.Name)
 	m.Equal(isGlobalNamespace, resp6.IsGlobalNamespace)
-	m.Equal(updatedStatus, resp6.Namespace.Info.Status)
+	m.Equal(updatedState, resp6.Namespace.Info.State)
 	m.Equal(updatedDescription, resp6.Namespace.Info.Description)
 	m.Equal(updatedOwner, resp6.Namespace.Info.Owner)
 	m.Equal(updatedData, resp6.Namespace.Info.Data)
 	m.Equal(updatedRetention, resp6.Namespace.Config.RetentionDays)
 	m.Equal(updatedEmitMetric, resp6.Namespace.Config.EmitMetric)
-	m.Equal(updatedHistoryArchivalStatus, resp6.Namespace.Config.HistoryArchivalStatus)
+	m.Equal(updatedHistoryArchivalState, resp6.Namespace.Config.HistoryArchivalState)
 	m.Equal(updatedHistoryArchivalURI, resp6.Namespace.Config.HistoryArchivalUri)
-	m.Equal(updatedVisibilityArchivalStatus, resp6.Namespace.Config.VisibilityArchivalStatus)
+	m.Equal(updatedVisibilityArchivalState, resp6.Namespace.Config.VisibilityArchivalState)
 	m.Equal(updatedVisibilityArchivalURI, resp6.Namespace.Config.VisibilityArchivalUri)
 	m.True(reflect.DeepEqual(testBinaries, resp6.Namespace.Config.BadBinaries))
 	m.Equal(updateClusterActive, resp6.Namespace.ReplicationConfig.ActiveClusterName)
@@ -806,15 +806,15 @@ func (m *MetadataPersistenceSuiteV2) TestUpdateNamespace() {
 func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() {
 	id := uuid.New()
 	name := "delete-namespace-test-name"
-	status := enumspb.NAMESPACE_STATUS_REGISTERED
+	state := enumspb.NAMESPACE_STATE_REGISTERED
 	description := "delete-namespace-test-description"
 	owner := "delete-namespace-test-owner"
 	data := map[string]string{"k1": "v1"}
 	retention := 10
 	emitMetric := true
-	historyArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	historyArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	historyArchivalURI := "test://history/uri"
-	visibilityArchivalStatus := enumspb.ARCHIVAL_STATUS_ENABLED
+	visibilityArchivalState := enumspb.ARCHIVAL_STATE_ENABLED
 	visibilityArchivalURI := "test://visibility/uri"
 
 	clusterActive := "some random active cluster name"
@@ -828,18 +828,18 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            int32(retention),
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
+			RetentionDays:           int32(retention),
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: clusterActive,
@@ -874,18 +874,18 @@ func (m *MetadataPersistenceSuiteV2) TestDeleteNamespace() {
 		&persistenceblobs.NamespaceInfo{
 			Id:          id,
 			Name:        name,
-			Status:      status,
+			State:       state,
 			Description: description,
 			Owner:       owner,
 			Data:        data,
 		},
 		&persistenceblobs.NamespaceConfig{
-			RetentionDays:            int32(retention),
-			EmitMetric:               emitMetric,
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
+			RetentionDays:           int32(retention),
+			EmitMetric:              emitMetric,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
 		},
 		&persistenceblobs.NamespaceReplicationConfig{
 			ActiveClusterName: clusterActive,
@@ -947,19 +947,19 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces() {
 				Info: &persistenceblobs.NamespaceInfo{
 					Id:          uuid.New(),
 					Name:        "list-namespace-test-name-1",
-					Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+					State:       enumspb.NAMESPACE_STATE_REGISTERED,
 					Description: "list-namespace-test-description-1",
 					Owner:       "list-namespace-test-owner-1",
 					Data:        map[string]string{"k1": "v1"},
 				},
 				Config: &persistenceblobs.NamespaceConfig{
-					RetentionDays:            109,
-					EmitMetric:               true,
-					HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_ENABLED,
-					HistoryArchivalUri:       "test://history/uri",
-					VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_ENABLED,
-					VisibilityArchivalUri:    "test://visibility/uri",
-					BadBinaries:              testBinaries1,
+					RetentionDays:           109,
+					EmitMetric:              true,
+					HistoryArchivalState:    enumspb.ARCHIVAL_STATE_ENABLED,
+					HistoryArchivalUri:      "test://history/uri",
+					VisibilityArchivalState: enumspb.ARCHIVAL_STATE_ENABLED,
+					VisibilityArchivalUri:   "test://visibility/uri",
+					BadBinaries:             testBinaries1,
 				},
 				ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 					ActiveClusterName: clusterActive1,
@@ -976,19 +976,19 @@ func (m *MetadataPersistenceSuiteV2) TestListNamespaces() {
 				Info: &persistenceblobs.NamespaceInfo{
 					Id:          uuid.New(),
 					Name:        "list-namespace-test-name-2",
-					Status:      enumspb.NAMESPACE_STATUS_REGISTERED,
+					State:       enumspb.NAMESPACE_STATE_REGISTERED,
 					Description: "list-namespace-test-description-2",
 					Owner:       "list-namespace-test-owner-2",
 					Data:        map[string]string{"k1": "v2"},
 				},
 				Config: &persistenceblobs.NamespaceConfig{
-					RetentionDays:            326,
-					EmitMetric:               false,
-					HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-					HistoryArchivalUri:       "",
-					VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-					VisibilityArchivalUri:    "",
-					BadBinaries:              testBinaries2,
+					RetentionDays:           326,
+					EmitMetric:              false,
+					HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+					HistoryArchivalUri:      "",
+					VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+					VisibilityArchivalUri:   "",
+					BadBinaries:             testBinaries2,
 				},
 				ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 					ActiveClusterName: clusterActive2,
diff --git a/common/persistence/persistence-tests/persistenceTestBase.go b/common/persistence/persistence-tests/persistenceTestBase.go
index 21a85e2d1f0..2aa3a392729 100644
--- a/common/persistence/persistence-tests/persistenceTestBase.go
+++ b/common/persistence/persistence-tests/persistenceTestBase.go
@@ -232,7 +232,7 @@ func (s *TestBase) Setup() {
 		RangeId:                 0,
 		TransferAckLevel:        0,
 		ReplicationAckLevel:     0,
-		TimerAckLevel:           &types.Timestamp{},
+		TimerAckLevelTime:       &types.Timestamp{},
 		ClusterTimerAckLevel:    map[string]*types.Timestamp{},
 		ClusterTransferAckLevel: map[string]int64{clusterName: 0},
 	}
@@ -1259,7 +1259,7 @@ func (s *TestBase) CreateDecisionTask(namespaceID string, workflowExecution comm
 				WorkflowId:  workflowExecution.WorkflowId,
 				RunId:       workflowExecution.RunId,
 				ScheduleId:  decisionScheduleID,
-				CreatedTime: types.TimestampNow(),
+				CreateTime:  types.TimestampNow(),
 			},
 		},
 	}
@@ -1303,8 +1303,8 @@ func (s *TestBase) CreateActivityTasks(namespaceID string, workflowExecution com
 					WorkflowId:  workflowExecution.WorkflowId,
 					RunId:       workflowExecution.RunId,
 					ScheduleId:  activityScheduleID,
-					Expiry:      timestamp.TimestampNowAddSeconds(defaultScheduleToStartTimeout).ToProto(),
-					CreatedTime: types.TimestampNow(),
+					ExpiryTime:  timestamp.TimestampNowAddSeconds(defaultScheduleToStartTimeout).ToProto(),
+					CreateTime:  types.TimestampNow(),
 				},
 				TaskId: taskID,
 			},
diff --git a/common/persistence/persistence-tests/shardPersistenceTest.go b/common/persistence/persistence-tests/shardPersistenceTest.go
index 8bb1c63fd90..d9a0fd28589 100644
--- a/common/persistence/persistence-tests/shardPersistenceTest.go
+++ b/common/persistence/persistence-tests/shardPersistenceTest.go
@@ -127,7 +127,7 @@ func (s *ShardPersistenceSuite) TestUpdateShard() {
 	updatedInfo.ReplicationAckLevel = updatedReplicationAckLevel
 	updatedInfo.StolenSinceRenew = updatedStolenSinceRenew
 	updatedTimerAckLevel := time.Now()
-	updatedInfo.TimerAckLevel, _ = types.TimestampProto(updatedTimerAckLevel)
+	updatedInfo.TimerAckLevelTime, _ = types.TimestampProto(updatedTimerAckLevel)
 	err2 := s.UpdateShard(updatedInfo, shardInfo.GetRangeId())
 	s.Nil(err2)
 
@@ -139,7 +139,7 @@ func (s *ShardPersistenceSuite) TestUpdateShard() {
 	s.Equal(updatedTransferAckLevel, info1.TransferAckLevel)
 	s.Equal(updatedReplicationAckLevel, info1.ReplicationAckLevel)
 	s.Equal(updatedStolenSinceRenew, info1.StolenSinceRenew)
-	info1timerAckLevelTime, _ := types.TimestampFromProto(info1.TimerAckLevel)
+	info1timerAckLevelTime, _ := types.TimestampFromProto(info1.TimerAckLevelTime)
 	s.EqualTimes(updatedTimerAckLevel, info1timerAckLevelTime)
 
 	failedUpdateInfo := copyShardInfo(shardInfo)
@@ -160,7 +160,7 @@ func (s *ShardPersistenceSuite) TestUpdateShard() {
 	s.Equal(updatedReplicationAckLevel, info2.ReplicationAckLevel)
 	s.Equal(updatedStolenSinceRenew, info2.StolenSinceRenew)
 
-	info1timerAckLevelTime, _ = types.TimestampFromProto(info1.TimerAckLevel)
+	info1timerAckLevelTime, _ = types.TimestampFromProto(info1.TimerAckLevelTime)
 	s.EqualTimes(updatedTimerAckLevel, info1timerAckLevelTime)
 }
 
@@ -172,6 +172,6 @@ func copyShardInfo(sourceInfo *persistenceblobs.ShardInfo) *persistenceblobs.Sha
 		TransferAckLevel:    sourceInfo.TransferAckLevel,
 		ReplicationAckLevel: sourceInfo.ReplicationAckLevel,
 		StolenSinceRenew:    sourceInfo.StolenSinceRenew,
-		TimerAckLevel:       sourceInfo.TimerAckLevel,
+		TimerAckLevelTime:   sourceInfo.TimerAckLevelTime,
 	}
 }
diff --git a/common/persistence/persistenceInterface.go b/common/persistence/persistenceInterface.go
index dcf18780fee..b6d74abac7c 100644
--- a/common/persistence/persistenceInterface.go
+++ b/common/persistence/persistenceInterface.go
@@ -228,7 +228,7 @@ type (
 		NextEventID                        int64
 		LastProcessedEvent                 int64
 		StartTimestamp                     time.Time
-		LastUpdatedTimestamp               time.Time
+		LastUpdateTimestamp                time.Time
 		CreateRequestID                    string
 		SignalCount                        int32
 		DecisionVersion                    int64
@@ -285,25 +285,25 @@ type (
 
 	// InternalActivityInfo details  for Persistence Interface
 	InternalActivityInfo struct {
-		Version                  int64
-		ScheduleID               int64
-		ScheduledEventBatchID    int64
-		ScheduledEvent           *serialization.DataBlob
-		ScheduledTime            time.Time
-		StartedID                int64
-		StartedEvent             *serialization.DataBlob
-		StartedTime              time.Time
-		ActivityID               string
-		RequestID                string
-		Details                  *commonpb.Payloads
-		ScheduleToStartTimeout   int32
-		ScheduleToCloseTimeout   int32
-		StartToCloseTimeout      int32
-		HeartbeatTimeout         int32
-		CancelRequested          bool
-		CancelRequestID          int64
-		LastHeartBeatUpdatedTime time.Time
-		TimerTaskStatus          int32
+		Version                 int64
+		ScheduleID              int64
+		ScheduledEventBatchID   int64
+		ScheduledEvent          *serialization.DataBlob
+		ScheduledTime           time.Time
+		StartedID               int64
+		StartedEvent            *serialization.DataBlob
+		StartedTime             time.Time
+		ActivityID              string
+		RequestID               string
+		Details                 *commonpb.Payloads
+		ScheduleToStartTimeout  int32
+		ScheduleToCloseTimeout  int32
+		StartToCloseTimeout     int32
+		HeartbeatTimeout        int32
+		CancelRequested         bool
+		CancelRequestID         int64
+		LastHeartbeatUpdateTime time.Time
+		TimerTaskStatus         int32
 		// For retry
 		Attempt                int32
 		NamespaceID            string
@@ -750,7 +750,7 @@ func InternalWorkflowExecutionInfoToProto(executionInfo *InternalWorkflowExecuti
 		LastEventTaskId:                         executionInfo.LastEventTaskID,
 		LastProcessedEvent:                      executionInfo.LastProcessedEvent,
 		StartTimeNanos:                          executionInfo.StartTimestamp.UnixNano(),
-		LastUpdatedTimeNanos:                    executionInfo.LastUpdatedTimestamp.UnixNano(),
+		LastUpdateTimeNanos:                     executionInfo.LastUpdateTimestamp.UnixNano(),
 		DecisionVersion:                         executionInfo.DecisionVersion,
 		DecisionScheduleId:                      executionInfo.DecisionScheduleID,
 		DecisionStartedId:                       executionInfo.DecisionStartedID,
@@ -839,7 +839,7 @@ func ProtoWorkflowExecutionToPartialInternalExecution(info *persistenceblobs.Wor
 		LastFirstEventID:                   info.GetLastFirstEventId(),
 		LastProcessedEvent:                 info.GetLastProcessedEvent(),
 		StartTimestamp:                     time.Unix(0, info.GetStartTimeNanos()),
-		LastUpdatedTimestamp:               time.Unix(0, info.GetLastUpdatedTimeNanos()),
+		LastUpdateTimestamp:                time.Unix(0, info.GetLastUpdateTimeNanos()),
 		CreateRequestID:                    state.GetCreateRequestId(),
 		DecisionVersion:                    info.GetDecisionVersion(),
 		DecisionScheduleID:                 info.GetDecisionScheduleId(),
@@ -906,36 +906,36 @@ func ProtoWorkflowExecutionToPartialInternalExecution(info *persistenceblobs.Wor
 
 func ProtoActivityInfoToInternalActivityInfo(decoded *persistenceblobs.ActivityInfo) *InternalActivityInfo {
 	info := &InternalActivityInfo{
-		NamespaceID:              decoded.GetNamespaceId(),
-		ScheduleID:               decoded.GetScheduleId(),
-		Details:                  decoded.LastHeartbeatDetails,
-		LastHeartBeatUpdatedTime: *timestamp.TimestampFromProto(decoded.LastHeartbeatUpdatedTime).ToTime(),
-		Version:                  decoded.GetVersion(),
-		ScheduledEventBatchID:    decoded.GetScheduledEventBatchId(),
-		ScheduledEvent:           NewDataBlob(decoded.ScheduledEvent, common.EncodingType(decoded.GetScheduledEventEncoding())),
-		ScheduledTime:            time.Unix(0, decoded.GetScheduledTimeNanos()),
-		StartedID:                decoded.GetStartedId(),
-		StartedTime:              time.Unix(0, decoded.GetStartedTimeNanos()),
-		ActivityID:               decoded.GetActivityId(),
-		RequestID:                decoded.GetRequestId(),
-		ScheduleToStartTimeout:   decoded.GetScheduleToStartTimeoutSeconds(),
-		ScheduleToCloseTimeout:   decoded.GetScheduleToCloseTimeoutSeconds(),
-		StartToCloseTimeout:      decoded.GetStartToCloseTimeoutSeconds(),
-		HeartbeatTimeout:         decoded.GetHeartbeatTimeoutSeconds(),
-		CancelRequested:          decoded.GetCancelRequested(),
-		CancelRequestID:          decoded.GetCancelRequestId(),
-		TimerTaskStatus:          decoded.GetTimerTaskStatus(),
-		Attempt:                  decoded.GetAttempt(),
-		StartedIdentity:          decoded.GetStartedIdentity(),
-		TaskQueue:                decoded.GetTaskQueue(),
-		HasRetryPolicy:           decoded.GetHasRetryPolicy(),
-		InitialInterval:          decoded.GetRetryInitialIntervalSeconds(),
-		BackoffCoefficient:       decoded.GetRetryBackoffCoefficient(),
-		MaximumInterval:          decoded.GetRetryMaximumIntervalSeconds(),
-		MaximumAttempts:          decoded.GetRetryMaximumAttempts(),
-		NonRetryableErrorTypes:   decoded.GetRetryNonRetryableErrorTypes(),
-		LastFailure:              decoded.GetRetryLastFailure(),
-		LastWorkerIdentity:       decoded.GetRetryLastWorkerIdentity(),
+		NamespaceID:             decoded.GetNamespaceId(),
+		ScheduleID:              decoded.GetScheduleId(),
+		Details:                 decoded.LastHeartbeatDetails,
+		LastHeartbeatUpdateTime: *timestamp.TimestampFromProto(decoded.GetLastHeartbeatUpdateTime()).ToTime(),
+		Version:                 decoded.GetVersion(),
+		ScheduledEventBatchID:   decoded.GetScheduledEventBatchId(),
+		ScheduledEvent:          NewDataBlob(decoded.ScheduledEvent, common.EncodingType(decoded.GetScheduledEventEncoding())),
+		ScheduledTime:           time.Unix(0, decoded.GetScheduledTimeNanos()),
+		StartedID:               decoded.GetStartedId(),
+		StartedTime:             time.Unix(0, decoded.GetStartedTimeNanos()),
+		ActivityID:              decoded.GetActivityId(),
+		RequestID:               decoded.GetRequestId(),
+		ScheduleToStartTimeout:  decoded.GetScheduleToStartTimeoutSeconds(),
+		ScheduleToCloseTimeout:  decoded.GetScheduleToCloseTimeoutSeconds(),
+		StartToCloseTimeout:     decoded.GetStartToCloseTimeoutSeconds(),
+		HeartbeatTimeout:        decoded.GetHeartbeatTimeoutSeconds(),
+		CancelRequested:         decoded.GetCancelRequested(),
+		CancelRequestID:         decoded.GetCancelRequestId(),
+		TimerTaskStatus:         decoded.GetTimerTaskStatus(),
+		Attempt:                 decoded.GetAttempt(),
+		StartedIdentity:         decoded.GetStartedIdentity(),
+		TaskQueue:               decoded.GetTaskQueue(),
+		HasRetryPolicy:          decoded.GetHasRetryPolicy(),
+		InitialInterval:         decoded.GetRetryInitialIntervalSeconds(),
+		BackoffCoefficient:      decoded.GetRetryBackoffCoefficient(),
+		MaximumInterval:         decoded.GetRetryMaximumIntervalSeconds(),
+		MaximumAttempts:         decoded.GetRetryMaximumAttempts(),
+		NonRetryableErrorTypes:  decoded.GetRetryNonRetryableErrorTypes(),
+		LastFailure:             decoded.GetRetryLastFailure(),
+		LastWorkerIdentity:      decoded.GetRetryLastWorkerIdentity(),
 	}
 	if decoded.GetRetryExpirationTimeNanos() != 0 {
 		info.ExpirationTime = time.Unix(0, decoded.GetRetryExpirationTimeNanos())
@@ -954,7 +954,7 @@ func (v *InternalActivityInfo) ToProto() *persistenceblobs.ActivityInfo {
 		NamespaceId:                   v.NamespaceID,
 		ScheduleId:                    v.ScheduleID,
 		LastHeartbeatDetails:          v.Details,
-		LastHeartbeatUpdatedTime:      timestamp.TimestampFromTime(&v.LastHeartBeatUpdatedTime).ToProto(),
+		LastHeartbeatUpdateTime:       timestamp.TimestampFromTime(&v.LastHeartbeatUpdateTime).ToProto(),
 		Version:                       v.Version,
 		ScheduledEventBatchId:         v.ScheduledEventBatchID,
 		ScheduledEvent:                scheduledEvent,
diff --git a/common/persistence/serialization/blob.go b/common/persistence/serialization/blob.go
index ed81f2ba656..64fc187f259 100644
--- a/common/persistence/serialization/blob.go
+++ b/common/persistence/serialization/blob.go
@@ -95,7 +95,7 @@ func ShardInfoFromBlob(b []byte, proto string, clusterName string) (*persistence
 
 	if len(shardInfo.GetClusterTimerAckLevel()) == 0 {
 		shardInfo.ClusterTimerAckLevel = map[string]*types.Timestamp{
-			clusterName: shardInfo.GetTimerAckLevel(),
+			clusterName: shardInfo.GetTimerAckLevelTime(),
 		}
 	}
 
diff --git a/common/persistence/sql/sqlExecutionManager.go b/common/persistence/sql/sqlExecutionManager.go
index 60e641e0c47..3fc3dbbeb5d 100644
--- a/common/persistence/sql/sqlExecutionManager.go
+++ b/common/persistence/sql/sqlExecutionManager.go
@@ -1065,7 +1065,7 @@ func (m *sqlExecutionManager) GetTimerIndexTasks(
 	}
 
 	if len(resp.Timers) > request.BatchSize {
-		goVisibilityTimestamp, err := types.TimestampFromProto(resp.Timers[request.BatchSize].VisibilityTimestamp)
+		goVisibilityTimestamp, err := types.TimestampFromProto(resp.Timers[request.BatchSize].VisibilityTime)
 		if err != nil {
 			return nil, serviceerror.NewInternal(fmt.Sprintf("GetTimerTasks: error converting time for page token: %v", err))
 		}
diff --git a/common/persistence/sql/sqlExecutionManagerUtil.go b/common/persistence/sql/sqlExecutionManagerUtil.go
index 60c0f1a9d34..7ad10276fa7 100644
--- a/common/persistence/sql/sqlExecutionManagerUtil.go
+++ b/common/persistence/sql/sqlExecutionManagerUtil.go
@@ -755,7 +755,7 @@ func createTransferTasks(
 			return err
 		}
 
-		info.VisibilityTimestamp = t
+		info.VisibilityTime = t
 
 		blob, err := serialization.TransferTaskInfoToBlob(info)
 		if err != nil {
@@ -935,7 +935,7 @@ func createTimerTasks(
 				return err
 			}
 
-			info.VisibilityTimestamp = protoVisTs
+			info.VisibilityTime = protoVisTs
 			blob, err := serialization.TimerTaskInfoToBlob(info)
 			if err != nil {
 				return err
@@ -1202,7 +1202,7 @@ func (m *sqlExecutionManager) createExecution(
 
 	// TODO we should set the start time and last update time on business logic layer
 	executionInfo.StartTimestamp = time.Now()
-	executionInfo.LastUpdatedTimestamp = executionInfo.StartTimestamp
+	executionInfo.LastUpdateTimestamp = executionInfo.StartTimestamp
 
 	row, err := buildExecutionRow(
 		executionInfo,
@@ -1260,7 +1260,7 @@ func updateExecution(
 	}
 
 	// TODO we should set the last update time on business logic layer
-	executionInfo.LastUpdatedTimestamp = time.Now()
+	executionInfo.LastUpdateTimestamp = time.Now()
 
 	row, err := buildExecutionRow(
 		executionInfo,
diff --git a/common/persistence/sql/sqlTaskManager.go b/common/persistence/sql/sqlTaskManager.go
index c0a9832a9a6..fe852261d2b 100644
--- a/common/persistence/sql/sqlTaskManager.go
+++ b/common/persistence/sql/sqlTaskManager.go
@@ -81,13 +81,13 @@ func (m *sqlTaskManager) LeaseTaskQueue(request *persistence.LeaseTaskQueueReque
 	if err != nil {
 		if err == sql.ErrNoRows {
 			tqInfo := &persistenceblobs.TaskQueueInfo{
-				NamespaceId: namespaceID,
-				Name:        request.TaskQueue,
-				TaskType:    request.TaskType,
-				AckLevel:    ackLevel,
-				Kind:        request.TaskQueueKind,
-				Expiry:      nil,
-				LastUpdated: types.TimestampNow(),
+				NamespaceId:    namespaceID,
+				Name:           request.TaskQueue,
+				TaskType:       request.TaskType,
+				AckLevel:       ackLevel,
+				Kind:           request.TaskQueueKind,
+				ExpiryTime:     nil,
+				LastUpdateTime: types.TimestampNow(),
 			}
 			blob, err := serialization.TaskQueueInfoToBlob(tqInfo)
 			if err != nil {
@@ -135,7 +135,7 @@ func (m *sqlTaskManager) LeaseTaskQueue(request *persistence.LeaseTaskQueueReque
 		}
 
 		// todo: we shoudnt edit protobufs
-		tqInfo.LastUpdated = types.TimestampNow()
+		tqInfo.LastUpdateTime = types.TimestampNow()
 
 		blob, err1 := serialization.TaskQueueInfoToBlob(tqInfo)
 		if err1 != nil {
@@ -178,11 +178,11 @@ func (m *sqlTaskManager) UpdateTaskQueue(request *persistence.UpdateTaskQueueReq
 	shardID := m.shardID(nidBytes, request.TaskQueueInfo.Name)
 
 	tq := request.TaskQueueInfo
-	tq.LastUpdated = types.TimestampNow()
+	tq.LastUpdateTime = types.TimestampNow()
 
 	var blob serialization.DataBlob
 	if request.TaskQueueInfo.Kind == enumspb.TASK_QUEUE_KIND_STICKY {
-		tq.Expiry, err = types.TimestampProto(stickyTaskQueueTTL())
+		tq.ExpiryTime, err = types.TimestampProto(stickyTaskQueueTTL())
 		if err != nil {
 			return nil, err
 		}
diff --git a/common/persistence/workflowStateStatusValidator.go b/common/persistence/workflowStateStatusValidator.go
index 1e7808b1c7f..221221e31ba 100644
--- a/common/persistence/workflowStateStatusValidator.go
+++ b/common/persistence/workflowStateStatusValidator.go
@@ -66,14 +66,14 @@ func ValidateCreateWorkflowStateStatus(
 		return err
 	}
 
-	// validate workflow state & close status
+	// validate workflow state & status
 	if state == enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED || status != enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING {
-		return serviceerror.NewInternal(fmt.Sprintf("Create workflow with invalid state: %v or close status: %v", state, status))
+		return serviceerror.NewInternal(fmt.Sprintf("Create workflow with invalid state: %v or status: %v", state, status))
 	}
 	return nil
 }
 
-// ValidateUpdateWorkflowStateStatus validate workflow state and close status
+// ValidateUpdateWorkflowStateStatus validate workflow state and status
 func ValidateUpdateWorkflowStateStatus(
 	state enumsspb.WorkflowExecutionState,
 	status enumspb.WorkflowExecutionStatus,
@@ -86,10 +86,10 @@ func ValidateUpdateWorkflowStateStatus(
 		return err
 	}
 
-	// validate workflow state & close status
+	// validate workflow state & status
 	if status == enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING {
 		if state == enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED {
-			return serviceerror.NewInternal(fmt.Sprintf("Update workflow with invalid state: %v or close status: %v", state, status))
+			return serviceerror.NewInternal(fmt.Sprintf("Update workflow with invalid state: %v or status: %v", state, status))
 		}
 	} else {
 		// enumspb.WORKFLOW_EXECUTION_STATUS_COMPLETED
@@ -99,7 +99,7 @@ func ValidateUpdateWorkflowStateStatus(
 		// enumspb.WORKFLOW_EXECUTION_STATUS_CONTINUED_AS_NEW
 		// enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT
 		if state != enumsspb.WORKFLOW_EXECUTION_STATE_COMPLETED {
-			return serviceerror.NewInternal(fmt.Sprintf("Update workflow with invalid state: %v or close status: %v", state, status))
+			return serviceerror.NewInternal(fmt.Sprintf("Update workflow with invalid state: %v or status: %v", state, status))
 		}
 	}
 	return nil
@@ -117,13 +117,13 @@ func validateWorkflowState(
 	return nil
 }
 
-// validateWorkflowStatus validate workflow close status
+// validateWorkflowStatus validate workflow status
 func validateWorkflowStatus(
 	status enumspb.WorkflowExecutionStatus,
 ) error {
 
 	if _, ok := validWorkflowStatuses[status]; !ok {
-		return serviceerror.NewInternal(fmt.Sprintf("Invalid workflow close status: %v", status))
+		return serviceerror.NewInternal(fmt.Sprintf("Invalid workflow status: %v", status))
 	}
 
 	return nil
diff --git a/common/service/config/archival.go b/common/service/config/archival.go
index 0cd03138e51..2c9396a8dbe 100644
--- a/common/service/config/archival.go
+++ b/common/service/config/archival.go
@@ -32,11 +32,11 @@ import (
 
 // Validate validates the archival config
 func (a *Archival) Validate(namespaceDefaults *ArchivalNamespaceDefaults) error {
-	if !isArchivalConfigValid(a.History.Status, a.History.EnableRead, namespaceDefaults.History.Status, namespaceDefaults.History.URI, a.History.Provider != nil) {
+	if !isArchivalConfigValid(a.History.State, a.History.EnableRead, namespaceDefaults.History.State, namespaceDefaults.History.URI, a.History.Provider != nil) {
 		return errors.New("Invalid history archival config")
 	}
 
-	if !isArchivalConfigValid(a.Visibility.Status, a.Visibility.EnableRead, namespaceDefaults.Visibility.Status, namespaceDefaults.Visibility.URI, a.Visibility.Provider != nil) {
+	if !isArchivalConfigValid(a.Visibility.State, a.Visibility.EnableRead, namespaceDefaults.Visibility.State, namespaceDefaults.Visibility.URI, a.Visibility.Provider != nil) {
 		return errors.New("Invalid visibility archival config")
 	}
 
diff --git a/common/service/config/config.go b/common/service/config/config.go
index db1650bb274..ffb4870a2d2 100644
--- a/common/service/config/config.go
+++ b/common/service/config/config.go
@@ -376,8 +376,8 @@ type (
 
 	// HistoryArchival contains the config for history archival
 	HistoryArchival struct {
-		// Status is the status of history archival either: enabled, disabled, or paused
-		Status string `yaml:"status"`
+		// State is the state of history archival either: enabled, disabled, or paused
+		State string `yaml:"state"`
 		// EnableRead whether history can be read from archival
 		EnableRead bool `yaml:"enableRead"`
 		// Provider contains the config for all history archivers
@@ -393,8 +393,8 @@ type (
 
 	// VisibilityArchival contains the config for visibility archival
 	VisibilityArchival struct {
-		// Status is the status of visibility archival either: enabled, disabled, or paused
-		Status string `yaml:"status"`
+		// State is the state of visibility archival either: enabled, disabled, or paused
+		State string `yaml:"state"`
 		// EnableRead whether visibility can be read from archival
 		EnableRead bool `yaml:"enableRead"`
 		// Provider contains the config for all visibility archivers
@@ -450,16 +450,16 @@ type (
 
 	// HistoryArchivalNamespaceDefaults is the default history archival config for each namespace
 	HistoryArchivalNamespaceDefaults struct {
-		// Status is the namespace default status of history archival: enabled or disabled
-		Status string `yaml:"status"`
+		// State is the namespace default state of history archival: enabled or disabled
+		State string `yaml:"state"`
 		// URI is the namespace default URI for history archiver
 		URI string `yaml:"URI"`
 	}
 
 	// VisibilityArchivalNamespaceDefaults is the default visibility archival config for each namespace
 	VisibilityArchivalNamespaceDefaults struct {
-		// Status is the namespace default status of visibility archival: enabled or disabled
-		Status string `yaml:"status"`
+		// State is the namespace default state of visibility archival: enabled or disabled
+		State string `yaml:"state"`
 		// URI is the namespace default URI for visibility archiver
 		URI string `yaml:"URI"`
 	}
diff --git a/common/service/dynamicconfig/constants.go b/common/service/dynamicconfig/constants.go
index 9f9b323b6eb..f3360b6d1fa 100644
--- a/common/service/dynamicconfig/constants.go
+++ b/common/service/dynamicconfig/constants.go
@@ -66,9 +66,9 @@ var keys = map[Key]string{
 	EnableReadFromClosedExecutionV2:        "system.enableReadFromClosedExecutionV2",
 	AdvancedVisibilityWritingMode:          "system.advancedVisibilityWritingMode",
 	EnableReadVisibilityFromES:             "system.enableReadVisibilityFromES",
-	HistoryArchivalStatus:                  "system.historyArchivalStatus",
+	HistoryArchivalState:                   "system.historyArchivalState",
 	EnableReadFromHistoryArchival:          "system.enableReadFromHistoryArchival",
-	VisibilityArchivalStatus:               "system.visibilityArchivalStatus",
+	VisibilityArchivalState:                "system.visibilityArchivalState",
 	EnableReadFromVisibilityArchival:       "system.enableReadFromVisibilityArchival",
 	EnableNamespaceNotActiveAutoForwarding: "system.enableNamespaceNotActiveAutoForwarding",
 	TransactionSizeLimit:                   "system.transactionSizeLimit",
@@ -328,12 +328,12 @@ const (
 	EnableReadVisibilityFromES
 	// DisableListVisibilityByFilter is config to disable list open/close workflow using filter
 	DisableListVisibilityByFilter
-	// HistoryArchivalStatus is key for the status of history archival
-	HistoryArchivalStatus
+	// HistoryArchivalState is key for the state of history archival
+	HistoryArchivalState
 	// EnableReadFromHistoryArchival is key for enabling reading history from archival store
 	EnableReadFromHistoryArchival
-	// VisibilityArchivalStatus is key for the status of visibility archival
-	VisibilityArchivalStatus
+	// VisibilityArchivalState is key for the state of visibility archival
+	VisibilityArchivalState
 	// EnableReadFromVisibilityArchival is key for enabling reading visibility from archival store
 	EnableReadFromVisibilityArchival
 	// EnableNamespaceNotActiveAutoForwarding whether enabling DC auto forwarding to active cluster
diff --git a/common/testing/history_event_util.go b/common/testing/history_event_util.go
index c10187d509f..7a43922b5f7 100644
--- a/common/testing/history_event_util.go
+++ b/common/testing/history_event_util.go
@@ -363,7 +363,7 @@ func InitializeHistoryEventGenerator(
 		historyEvent := getDefaultHistoryEvent(eventID, version)
 		historyEvent.EventType = enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIMED_OUT
 		historyEvent.Attributes = &historypb.HistoryEvent_WorkflowExecutionTimedOutEventAttributes{WorkflowExecutionTimedOutEventAttributes: &historypb.WorkflowExecutionTimedOutEventAttributes{
-			RetryStatus: enumspb.RETRY_STATUS_TIMEOUT,
+			RetryState: enumspb.RETRY_STATE_TIMEOUT,
 		}}
 		return historyEvent
 	})
@@ -754,7 +754,7 @@ func InitializeHistoryEventGenerator(
 				RunId:      lastEvent.GetChildWorkflowExecutionStartedEventAttributes().GetWorkflowExecution().RunId,
 			},
 			StartedEventId: lastEvent.EventId,
-			RetryStatus:    enumspb.RETRY_STATUS_TIMEOUT,
+			RetryState:     enumspb.RETRY_STATE_TIMEOUT,
 		}}
 		return historyEvent
 	})
diff --git a/go.mod b/go.mod
index 3cbe8b797c3..51049c9f8be 100644
--- a/go.mod
+++ b/go.mod
@@ -60,8 +60,8 @@ require (
 	github.com/urfave/cli v1.22.4
 	github.com/valyala/fastjson v1.5.1
 	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
-	go.temporal.io/api v0.26.1-0.20200709011738-4980ceeb124f
-	go.temporal.io/sdk v0.26.1-0.20200709013507-d843b784901c
+	go.temporal.io/api v0.26.1-0.20200710002840-ffa3765cd431
+	go.temporal.io/sdk v0.26.1-0.20200710011143-c568dee2b646
 	go.uber.org/atomic v1.6.0
 	go.uber.org/multierr v1.5.0
 	go.uber.org/zap v1.15.0
diff --git a/go.sum b/go.sum
index c1a28897cf0..d7da0454123 100644
--- a/go.sum
+++ b/go.sum
@@ -355,10 +355,10 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.temporal.io/api v0.26.1-0.20200709011738-4980ceeb124f h1:0TxdShMjfijK4HbFOAs1aojFh1CKChBy4p0UuhvCmvE=
-go.temporal.io/api v0.26.1-0.20200709011738-4980ceeb124f/go.mod h1:8FoagzuIjHPU7cT0qryb6QS7ic8xzFB3aiaFzFvrllk=
-go.temporal.io/sdk v0.26.1-0.20200709013507-d843b784901c h1:setQv6Y1vaeM0L9JXpNi9vg5JixDmPvQ5yGMS/jb2Xk=
-go.temporal.io/sdk v0.26.1-0.20200709013507-d843b784901c/go.mod h1:raUg1GYUk89Ys/q4btqPp585/H0MVs0PflC2ex+WLGk=
+go.temporal.io/api v0.26.1-0.20200710002840-ffa3765cd431 h1:bkGYjVVwcvlAJnj6IcfExAz+39VD7DNnYJEa3+RmE8E=
+go.temporal.io/api v0.26.1-0.20200710002840-ffa3765cd431/go.mod h1:/uu734vrpmM4MbDmYairHFDBS4dOSMDDqf5YLRLwJj4=
+go.temporal.io/sdk v0.26.1-0.20200710011143-c568dee2b646 h1:6n9MdoEe95AlA5WOtDN8OkkdNgGmHwwBfRojRErpTG8=
+go.temporal.io/sdk v0.26.1-0.20200710011143-c568dee2b646/go.mod h1:5Y3tuHg943FczyG4Ciji4VSM+RR/CxckQPY6OQ9bwLY=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
@@ -599,8 +599,8 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200708133552-18036109789b h1:gYoomKOmhJ9YGwv9D05xH6fNWcNBNrMvOuoysvYIVV4=
-google.golang.org/genproto v0.0.0-20200708133552-18036109789b/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3 h1:JwLN1jVnmIsfE4HkDVe2AblFAbo0Z+4cjteDSOnv6oE=
+google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
diff --git a/host/gethistory_test.go b/host/gethistory_test.go
index 7f9cb609438..0627ef7da16 100644
--- a/host/gethistory_test.go
+++ b/host/gethistory_test.go
@@ -138,7 +138,7 @@ func (s *integrationSuite) TestGetWorkflowExecutionHistory_All() {
 			// since the page size have essential no relation with number of events..
 			// so just use a really larger number, to test whether long poll works
 			MaximumPageSize: 100,
-			WaitForNewEvent: isLongPoll,
+			WaitNewEvent:    isLongPoll,
 			NextPageToken:   token,
 		})
 		s.NoError(err)
@@ -305,7 +305,7 @@ func (s *integrationSuite) TestGetWorkflowExecutionHistory_Close() {
 			// since the page size have essential no relation with number of events..
 			// so just use a really larger number, to test whether long poll works
 			MaximumPageSize:        100,
-			WaitForNewEvent:        isLongPoll,
+			WaitNewEvent:           isLongPoll,
 			NextPageToken:          token,
 			HistoryEventFilterType: closeEventOnly,
 		})
@@ -466,7 +466,7 @@ func (s *integrationSuite) TestGetWorkflowExecutionHistory_GetRawHistoryData() {
 			// since the page size have essential no relation with number of events..
 			// so just use a really larger number, to test whether long poll works
 			MaximumPageSize: 100,
-			WaitForNewEvent: isLongPoll,
+			WaitNewEvent:    isLongPoll,
 			NextPageToken:   token,
 		})
 		s.Nil(err)
diff --git a/host/integration_test.go b/host/integration_test.go
index 38c5a6645c4..3960908460d 100644
--- a/host/integration_test.go
+++ b/host/integration_test.go
@@ -722,7 +722,7 @@ func (s *integrationSuite) TestWorkflowRetryFailures() {
 				{
 					DecisionType: enumspb.DECISION_TYPE_FAIL_WORKFLOW_EXECUTION,
 					Attributes: &decisionpb.Decision_FailWorkflowExecutionDecisionAttributes{FailWorkflowExecutionDecisionAttributes: &decisionpb.FailWorkflowExecutionDecisionAttributes{
-						//Reason:  "retryable-error",
+						// Reason:  "retryable-error",
 						Failure: failure.NewServerFailure(errorReason, nonRetryable),
 					}},
 				}}, nil
@@ -859,7 +859,7 @@ func (s *integrationSuite) TestCronWorkflow() {
 		WorkflowRunTimeoutSeconds:  100,
 		WorkflowTaskTimeoutSeconds: 1,
 		Identity:                   identity,
-		CronSchedule:               cronSchedule, //minimum interval by standard spec is 1m (* * * * *, use non-standard descriptor for short interval for test
+		CronSchedule:               cronSchedule, // minimum interval by standard spec is 1m (* * * * *, use non-standard descriptor for short interval for test
 		Memo:                       memo,
 		SearchAttributes:           searchAttr,
 	}
@@ -1064,7 +1064,7 @@ func (s *integrationSuite) TestCronWorkflowTimeout() {
 		WorkflowRunTimeoutSeconds:  1, // set workflow timeout to 1s
 		WorkflowTaskTimeoutSeconds: 1,
 		Identity:                   identity,
-		CronSchedule:               cronSchedule, //minimum interval by standard spec is 1m (* * * * *), use non-standard descriptor for short interval for test
+		CronSchedule:               cronSchedule, // minimum interval by standard spec is 1m (* * * * *), use non-standard descriptor for short interval for test
 		Memo:                       memo,
 		SearchAttributes:           searchAttr,
 	}
@@ -1603,7 +1603,7 @@ func (s *integrationSuite) TestVisibility() {
 				WorkflowId: startRequest.WorkflowId,
 				RunId:      startResponse.RunId,
 			},
-			WaitForNewEvent:        true,
+			WaitNewEvent:           true,
 			HistoryEventFilterType: historyEventFilterType,
 			NextPageToken:          nextToken,
 		})
@@ -2045,7 +2045,7 @@ func (s *integrationSuite) TestCronChildWorkflowExecution() {
 	sort.Slice(closedExecutions, func(i, j int) bool {
 		return closedExecutions[i].GetStartTime().GetValue() < closedExecutions[j].GetStartTime().GetValue()
 	})
-	//The first parent is not the cron workflow, only verify child workflow with cron schedule
+	// The first parent is not the cron workflow, only verify child workflow with cron schedule
 	lastExecution := closedExecutions[1]
 	for i := 2; i != 4; i++ {
 		executionInfo := closedExecutions[i]
@@ -2177,7 +2177,7 @@ func (s *integrationSuite) TestDecisionTaskFailed() {
 	signalCount := 0
 	sendSignal := false
 	lastDecisionTimestamp := int64(0)
-	//var signalEvent *historypb.HistoryEvent
+	// var signalEvent *historypb.HistoryEvent
 	dtHandler := func(execution *commonpb.WorkflowExecution, wt *commonpb.WorkflowType,
 		previousStartedEventID, startedEventID int64, history *historypb.History) ([]*decisionpb.Decision, error) {
 		// Count signals
@@ -2490,7 +2490,7 @@ func (s *integrationSuite) TestTransientDecisionTimeout() {
 	workflowComplete := false
 	failDecision := true
 	signalCount := 0
-	//var signalEvent *historypb.HistoryEvent
+	// var signalEvent *historypb.HistoryEvent
 	dtHandler := func(execution *commonpb.WorkflowExecution, wt *commonpb.WorkflowType,
 		previousStartedEventID, startedEventID int64, history *historypb.History) ([]*decisionpb.Decision, error) {
 		if failDecision {
@@ -3106,7 +3106,7 @@ func (s *integrationSuite) TestStickyTaskqueueResetThenTimeout() {
 		RequestId:         uuid.New(),
 	})
 
-	//Reset sticky taskqueue before sticky decision task starts
+	// Reset sticky taskqueue before sticky decision task starts
 	s.engine.ResetStickyTaskQueue(NewContext(), &workflowservice.ResetStickyTaskQueueRequest{
 		Namespace: s.namespace,
 		Execution: workflowExecution,
diff --git a/host/integrationbase.go b/host/integrationbase.go
index a881114d084..3bb0c107fde 100644
--- a/host/integrationbase.go
+++ b/host/integrationbase.go
@@ -97,13 +97,13 @@ func (s *IntegrationBase) setupSuite(defaultClusterConfigFile string) {
 	s.testRawHistoryNamespaceName = "TestRawHistoryNamespace"
 	s.namespace = s.randomizeStr("integration-test-namespace")
 	s.Require().NoError(
-		s.registerNamespace(s.namespace, 1, enumspb.ARCHIVAL_STATUS_DISABLED, "", enumspb.ARCHIVAL_STATUS_DISABLED, ""))
+		s.registerNamespace(s.namespace, 1, enumspb.ARCHIVAL_STATE_DISABLED, "", enumspb.ARCHIVAL_STATE_DISABLED, ""))
 	s.Require().NoError(
-		s.registerNamespace(s.testRawHistoryNamespaceName, 1, enumspb.ARCHIVAL_STATUS_DISABLED, "", enumspb.ARCHIVAL_STATUS_DISABLED, ""))
+		s.registerNamespace(s.testRawHistoryNamespaceName, 1, enumspb.ARCHIVAL_STATE_DISABLED, "", enumspb.ARCHIVAL_STATE_DISABLED, ""))
 
 	s.foreignNamespace = s.randomizeStr("integration-foreign-test-namespace")
 	s.Require().NoError(
-		s.registerNamespace(s.foreignNamespace, 1, enumspb.ARCHIVAL_STATUS_DISABLED, "", enumspb.ARCHIVAL_STATUS_DISABLED, ""))
+		s.registerNamespace(s.foreignNamespace, 1, enumspb.ARCHIVAL_STATE_DISABLED, "", enumspb.ARCHIVAL_STATE_DISABLED, ""))
 
 	s.Require().NoError(s.registerArchivalNamespace())
 
@@ -157,21 +157,21 @@ func (s *IntegrationBase) tearDownSuite() {
 func (s *IntegrationBase) registerNamespace(
 	namespace string,
 	retentionDays int,
-	historyArchivalStatus enumspb.ArchivalStatus,
+	historyArchivalState enumspb.ArchivalState,
 	historyArchivalURI string,
-	visibilityArchivalStatus enumspb.ArchivalStatus,
+	visibilityArchivalState enumspb.ArchivalState,
 	visibilityArchivalURI string,
 ) error {
 	ctx, cancel := rpc.NewContextWithTimeoutAndHeaders(10000 * time.Second)
 	defer cancel()
 	_, err := s.engine.RegisterNamespace(ctx, &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            namespace,
-		WorkflowExecutionRetentionPeriodInDays: int32(retentionDays),
-		HistoryArchivalStatus:                  historyArchivalStatus,
-		HistoryArchivalUri:                     historyArchivalURI,
-		VisibilityArchivalStatus:               visibilityArchivalStatus,
-		VisibilityArchivalUri:                  visibilityArchivalURI,
+		Name:                                 namespace,
+		Description:                          namespace,
+		WorkflowExecutionRetentionPeriodDays: int32(retentionDays),
+		HistoryArchivalState:                 historyArchivalState,
+		HistoryArchivalUri:                   historyArchivalURI,
+		VisibilityArchivalState:              visibilityArchivalState,
+		VisibilityArchivalUri:                visibilityArchivalURI,
 	})
 
 	return err
@@ -220,17 +220,17 @@ func (s *IntegrationBase) registerArchivalNamespace() error {
 	namespaceRequest := &persistence.CreateNamespaceRequest{
 		Namespace: &persistenceblobs.NamespaceDetail{
 			Info: &persistenceblobs.NamespaceInfo{
-				Id:     uuid.New(),
-				Name:   s.archivalNamespace,
-				Status: enumspb.NAMESPACE_STATUS_REGISTERED,
+				Id:    uuid.New(),
+				Name:  s.archivalNamespace,
+				State: enumspb.NAMESPACE_STATE_REGISTERED,
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            0,
-				HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_ENABLED,
-				HistoryArchivalUri:       s.testCluster.archiverBase.historyURI,
-				VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_ENABLED,
-				VisibilityArchivalUri:    s.testCluster.archiverBase.visibilityURI,
-				BadBinaries:              &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
+				RetentionDays:           0,
+				HistoryArchivalState:    enumspb.ARCHIVAL_STATE_ENABLED,
+				HistoryArchivalUri:      s.testCluster.archiverBase.historyURI,
+				VisibilityArchivalState: enumspb.ARCHIVAL_STATE_ENABLED,
+				VisibilityArchivalUri:   s.testCluster.archiverBase.visibilityURI,
+				BadBinaries:             &namespacepb.BadBinaries{Binaries: map[string]*namespacepb.BadBinaryInfo{}},
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: currentClusterName,
diff --git a/host/ndc/nDC_integration_test.go b/host/ndc/nDC_integration_test.go
index b04d64cfded..a4aa4f9724e 100644
--- a/host/ndc/nDC_integration_test.go
+++ b/host/ndc/nDC_integration_test.go
@@ -262,7 +262,7 @@ func (s *nDCIntegrationTestSuite) verifyEventHistory(
 			},
 			MaximumPageSize:        1000,
 			NextPageToken:          nil,
-			WaitForNewEvent:        false,
+			WaitNewEvent:           false,
 			HistoryEventFilterType: enumspb.HISTORY_EVENT_FILTER_TYPE_ALL_EVENT,
 		},
 	)
@@ -568,7 +568,7 @@ func (s *nDCIntegrationTestSuite) TestHandcraftedMultipleBranches() {
 				Version:   31,
 				EventType: enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIMED_OUT,
 				Attributes: &historypb.HistoryEvent_WorkflowExecutionTimedOutEventAttributes{WorkflowExecutionTimedOutEventAttributes: &historypb.WorkflowExecutionTimedOutEventAttributes{
-					RetryStatus: enumspb.RETRY_STATUS_TIMEOUT,
+					RetryState: enumspb.RETRY_STATE_TIMEOUT,
 				}},
 			},
 		}},
@@ -1452,7 +1452,7 @@ func (s *nDCIntegrationTestSuite) TestAdminGetWorkflowExecutionRawHistoryV2() {
 				Version:   32,
 				EventType: enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIMED_OUT,
 				Attributes: &historypb.HistoryEvent_WorkflowExecutionTimedOutEventAttributes{WorkflowExecutionTimedOutEventAttributes: &historypb.WorkflowExecutionTimedOutEventAttributes{
-					RetryStatus: enumspb.RETRY_STATUS_TIMEOUT,
+					RetryState: enumspb.RETRY_STATE_TIMEOUT,
 				}},
 			},
 		}},
@@ -1612,8 +1612,8 @@ func (s *nDCIntegrationTestSuite) registerNamespace() {
 		IsGlobalNamespace: true,
 		Clusters:          clusterReplicationConfig,
 		// make the active cluster `standby` and replicate to `active` cluster
-		ActiveClusterName:                      clusterName[1],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		ActiveClusterName:                    clusterName[1],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	})
 	s.Require().NoError(err)
 
diff --git a/host/testcluster.go b/host/testcluster.go
index 298418f658f..63a24a476a6 100644
--- a/host/testcluster.go
+++ b/host/testcluster.go
@@ -262,12 +262,12 @@ func newArchiverBase(enabled bool, logger log.Logger) *ArchiverBase {
 	return &ArchiverBase{
 		metadata: archiver.NewArchivalMetadata(dcCollection, "enabled", true, "enabled", true, &config.ArchivalNamespaceDefaults{
 			History: config.HistoryArchivalNamespaceDefaults{
-				Status: "enabled",
-				URI:    "testScheme://test/history/archive/path",
+				State: "enabled",
+				URI:   "testScheme://test/history/archive/path",
 			},
 			Visibility: config.VisibilityArchivalNamespaceDefaults{
-				Status: "enabled",
-				URI:    "testScheme://test/visibility/archive/path",
+				State: "enabled",
+				URI:   "testScheme://test/visibility/archive/path",
 			},
 		}),
 		provider:                 provider,
diff --git a/host/xdc/elasticsearch_test.go b/host/xdc/elasticsearch_test.go
index dedb5d3d7a2..556ea77e8dc 100644
--- a/host/xdc/elasticsearch_test.go
+++ b/host/xdc/elasticsearch_test.go
@@ -156,11 +156,11 @@ func (s *esCrossDCTestSuite) TestSearchAttributes() {
 	namespace := "test-xdc-search-attr-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Clusters:                               clusterReplicationConfigES,
-		ActiveClusterName:                      clusterNameES[0],
-		IsGlobalNamespace:                      true,
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		Clusters:                             clusterReplicationConfigES,
+		ActiveClusterName:                    clusterNameES[0],
+		IsGlobalNamespace:                    true,
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
diff --git a/host/xdc/integration_failover_test.go b/host/xdc/integration_failover_test.go
index f2363a38db0..6f2fcc2a541 100644
--- a/host/xdc/integration_failover_test.go
+++ b/host/xdc/integration_failover_test.go
@@ -139,11 +139,11 @@ func (s *integrationClustersTestSuite) TestNamespaceFailover() {
 	namespace := "test-namespace-for-fail-over-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 7,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 7,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -225,11 +225,11 @@ func (s *integrationClustersTestSuite) TestSimpleWorkflowFailover() {
 	namespace := "test-simple-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -529,11 +529,11 @@ func (s *integrationClustersTestSuite) TestStickyDecisionFailover() {
 	namespace := "test-sticky-decision-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -704,11 +704,11 @@ func (s *integrationClustersTestSuite) TestStartWorkflowExecution_Failover_Workf
 	namespace := "test-start-workflow-failover-ID-reuse-policy" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -841,11 +841,11 @@ func (s *integrationClustersTestSuite) TestTerminateFailover() {
 	namespace := "test-terminate-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1026,11 +1026,11 @@ func (s *integrationClustersTestSuite) TestContinueAsNewFailover() {
 	namespace := "test-continueAsNew-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1164,11 +1164,11 @@ func (s *integrationClustersTestSuite) TestSignalFailover() {
 	namespace := "test-signal-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1345,11 +1345,11 @@ func (s *integrationClustersTestSuite) TestUserTimerFailover() {
 	namespace := "test-user-timer-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1517,11 +1517,11 @@ func (s *integrationClustersTestSuite) TestActivityHeartbeatFailover() {
 	namespace := "test-activity-heartbeat-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1726,11 +1726,11 @@ func (s *integrationClustersTestSuite) TestTransientDecisionFailover() {
 	namespace := "test-transient-decision-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1847,11 +1847,11 @@ func (s *integrationClustersTestSuite) TestCronWorkflowFailover() {
 	namespace := "test-cron-workflow-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
@@ -1947,11 +1947,11 @@ func (s *integrationClustersTestSuite) TestWorkflowRetryFailover() {
 	namespace := "test-workflow-retry-failover-" + common.GenerateRandomString(5)
 	client1 := s.cluster1.GetFrontendClient() // active
 	regReq := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		IsGlobalNamespace:                      true,
-		Clusters:                               clusterReplicationConfig,
-		ActiveClusterName:                      clusterName[0],
-		WorkflowExecutionRetentionPeriodInDays: 1,
+		Name:                                 namespace,
+		IsGlobalNamespace:                    true,
+		Clusters:                             clusterReplicationConfig,
+		ActiveClusterName:                    clusterName[0],
+		WorkflowExecutionRetentionPeriodDays: 1,
 	}
 	_, err := client1.RegisterNamespace(host.NewContext(), regReq)
 	s.NoError(err)
diff --git a/proto/api b/proto/api
index 0106bb5b9a8..98296c1366c 160000
--- a/proto/api
+++ b/proto/api
@@ -1 +1 @@
-Subproject commit 0106bb5b9a83f2f82e4b2e86f0e8dce89d57c6b2
+Subproject commit 98296c1366c7f5b977448af9503257ed2528d843
diff --git a/proto/api-linter.yaml b/proto/api-linter.yaml
new file mode 100644
index 00000000000..5ad875f25cf
--- /dev/null
+++ b/proto/api-linter.yaml
@@ -0,0 +1,38 @@
+- included_paths:
+    - '**/*.proto'
+  disabled_rules:
+    - 'core::0192::has-comments'
+    - 'core::0191::java-outer-classname'
+    - 'core::0191::java-multiple-files'
+    - 'core::0191::java-package'
+
+- included_paths:
+    - '**/message.proto'
+  disabled_rules:
+    - 'core::0122::name-suffix'
+    - 'core::0123::resource-annotation'
+    - 'core::0142::time-field-type' # should be gone after time fields conversion
+
+- included_paths:
+    - '**/*service/v1/request_response.proto'
+  disabled_rules:
+    - 'core::0122::name-suffix'
+    - 'core::0131::request-name-required'
+    - 'core::0131::request-unknown-fields'
+    - 'core::0132::request-parent-required'
+    - 'core::0132::request-unknown-fields'
+    - 'core::0132::response-unknown-fields'
+    - 'core::0142::time-field-type' # should be gone after time fields conversion
+    - 'core::0158::response-next-page-token-field'
+    - 'core::0158::response-plural-first-field'
+    - 'core::0158::response-repeated-first-field'
+    - 'core::0158::request-page-token-field'
+    - 'core::0158::request-page-size-field'
+    - 'core::0140::prepositions' # should be gone after time fields conversion
+
+- included_paths:
+    - '**/*service/v1/service.proto'
+  disabled_rules:
+    - 'core::0127::http-annotation'
+    - 'core::0131::method-signature'
+    - 'core::0131::response-message-name'
diff --git a/buf.yaml b/proto/buf.yaml
similarity index 61%
rename from buf.yaml
rename to proto/buf.yaml
index c125bbdc66a..56d9450be4c 100644
--- a/buf.yaml
+++ b/proto/buf.yaml
@@ -1,8 +1,10 @@
 build:
   roots:
-    - proto/internal
-    - proto/temporal-proto
+    - internal
+    - api
 lint:
+  ignore:
+    - temporal/api # do not lint public api
   use:
     - DEFAULT
   except:
diff --git a/proto/internal/temporal/server/api/adminservice/v1/request_response.proto b/proto/internal/temporal/server/api/adminservice/v1/request_response.proto
index 264c8466370..e9e5aa12008 100644
--- a/proto/internal/temporal/server/api/adminservice/v1/request_response.proto
+++ b/proto/internal/temporal/server/api/adminservice/v1/request_response.proto
@@ -174,7 +174,7 @@ message DescribeClusterResponse {
     temporal.server.api.cluster.v1.MembershipInfo membership_info = 2;
 }
 
-message ReadDLQMessagesRequest {
+message GetDLQMessagesRequest {
     temporal.server.api.enums.v1.DeadLetterQueueType type = 1;
     int32 shard_id = 2;
     string source_cluster = 3;
@@ -183,7 +183,7 @@ message ReadDLQMessagesRequest {
     bytes next_page_token = 6;
 }
 
-message ReadDLQMessagesResponse {
+message GetDLQMessagesResponse {
     temporal.server.api.enums.v1.DeadLetterQueueType type = 1;
     repeated temporal.server.api.replication.v1.ReplicationTask replication_tasks = 2;
     bytes next_page_token = 3;
diff --git a/proto/internal/temporal/server/api/adminservice/v1/service.proto b/proto/internal/temporal/server/api/adminservice/v1/service.proto
index 8e46abaf7f0..155bad75085 100644
--- a/proto/internal/temporal/server/api/adminservice/v1/service.proto
+++ b/proto/internal/temporal/server/api/adminservice/v1/service.proto
@@ -78,8 +78,8 @@ service AdminService {
     rpc DescribeCluster(DescribeClusterRequest) returns (DescribeClusterResponse) {
     }
 
-    // ReadDLQMessages returns messages from DLQ.
-    rpc ReadDLQMessages(ReadDLQMessagesRequest) returns (ReadDLQMessagesResponse) {
+    // GetDLQMessages returns messages from DLQ.
+    rpc GetDLQMessages(GetDLQMessagesRequest) returns (GetDLQMessagesResponse) {
     }
 
     // PurgeDLQMessages purges messages from DLQ.
diff --git a/proto/internal/temporal/server/api/historyservice/v1/request_response.proto b/proto/internal/temporal/server/api/historyservice/v1/request_response.proto
index 6138135e230..c27d8b8c5d3 100644
--- a/proto/internal/temporal/server/api/historyservice/v1/request_response.proto
+++ b/proto/internal/temporal/server/api/historyservice/v1/request_response.proto
@@ -466,7 +466,7 @@ message ReapplyEventsRequest {
 message ReapplyEventsResponse {
 }
 
-message ReadDLQMessagesRequest {
+message GetDLQMessagesRequest {
     temporal.server.api.enums.v1.DeadLetterQueueType type = 1;
     int32 shard_id = 2;
     string source_cluster = 3;
@@ -475,7 +475,7 @@ message ReadDLQMessagesRequest {
     bytes next_page_token = 6;
 }
 
-message ReadDLQMessagesResponse {
+message GetDLQMessagesResponse {
     temporal.server.api.enums.v1.DeadLetterQueueType type = 1;
     repeated temporal.server.api.replication.v1.ReplicationTask replication_tasks = 2;
     bytes next_page_token = 3;
diff --git a/proto/internal/temporal/server/api/historyservice/v1/service.proto b/proto/internal/temporal/server/api/historyservice/v1/service.proto
index ce544c3788b..fcface061f4 100644
--- a/proto/internal/temporal/server/api/historyservice/v1/service.proto
+++ b/proto/internal/temporal/server/api/historyservice/v1/service.proto
@@ -121,6 +121,8 @@ service HistoryService {
     rpc SignalWorkflowExecution (SignalWorkflowExecutionRequest) returns (SignalWorkflowExecutionResponse) {
     }
 
+    // (-- api-linter: core::0136::prepositions=disabled
+    //     aip.dev/not-precedent: "With" is needed here. --)
     // SignalWithStartWorkflowExecution is used to ensure sending a signal event to a workflow execution.
     // If workflow is running, this results in WorkflowExecutionSignaled event recorded in the history
     // and a decision task being created for the execution.
@@ -218,19 +220,19 @@ service HistoryService {
     rpc ReapplyEvents (ReapplyEventsRequest) returns (ReapplyEventsResponse) {
     }
 
-    // ReadDLQMessages returns messages from DLQ
-    rpc ReadDLQMessages(ReadDLQMessagesRequest) returns (ReadDLQMessagesResponse) {
+    // GetDLQMessages returns messages from DLQ.
+    rpc GetDLQMessages(GetDLQMessagesRequest) returns (GetDLQMessagesResponse) {
     }
 
-    // PurgeDLQMessages purges messages from DLQ
+    // PurgeDLQMessages purges messages from DLQ.
     rpc PurgeDLQMessages(PurgeDLQMessagesRequest) returns (PurgeDLQMessagesResponse) {
     }
 
-    // MergeDLQMessages merges messages from DLQ
+    // MergeDLQMessages merges messages from DLQ.
     rpc MergeDLQMessages(MergeDLQMessagesRequest) returns (MergeDLQMessagesResponse) {
     }
 
-    // RefreshWorkflowTasks refreshes all tasks of a workflow
+    // RefreshWorkflowTasks refreshes all tasks of a workflow.
     rpc RefreshWorkflowTasks(RefreshWorkflowTasksRequest) returns (RefreshWorkflowTasksResponse) {
     }
 }
diff --git a/proto/internal/temporal/server/api/matchingservice/v1/service.proto b/proto/internal/temporal/server/api/matchingservice/v1/service.proto
index a7731927ae8..0a8ef17e960 100644
--- a/proto/internal/temporal/server/api/matchingservice/v1/service.proto
+++ b/proto/internal/temporal/server/api/matchingservice/v1/service.proto
@@ -32,11 +32,15 @@ import "temporal/server/api/matchingservice/v1/request_response.proto";
 // with completion or failure.
 service MatchingService {
 
+    // (-- api-linter: core::0136::prepositions=disabled
+    //     aip.dev/not-precedent: TODO: Rename to PollWorkflowTaskQueue. --)
     // PollForDecisionTask is called by frontend to process DecisionTask from a specific task queue.  A
     // DecisionTask is dispatched to callers for active workflow executions, with pending decisions.
     rpc PollForDecisionTask (PollForDecisionTaskRequest) returns (PollForDecisionTaskResponse) {
     }
 
+    // (-- api-linter: core::0136::prepositions=disabled
+    //     aip.dev/not-precedent: TODO: Rename to PollActivityTaskQueue. --)
     // PollForActivityTask is called by frontend to process ActivityTask from a specific task queue.  ActivityTask
     // is dispatched to callers whenever a ScheduleTask decision is made for a workflow execution.
     rpc PollForActivityTask (PollForActivityTaskRequest) returns (PollForActivityTaskResponse) {
diff --git a/proto/internal/temporal/server/api/namespace/v1/message.proto b/proto/internal/temporal/server/api/namespace/v1/message.proto
index 418b325c29b..fe6ad7890c2 100644
--- a/proto/internal/temporal/server/api/namespace/v1/message.proto
+++ b/proto/internal/temporal/server/api/namespace/v1/message.proto
@@ -25,6 +25,10 @@ package temporal.server.api.namespace.v1;
 option go_package = "go.temporal.io/server/api/namespace/v1;namespace";
 
 message NamespaceCacheInfo {
-    int64 num_of_items_in_cache_by_id = 1;
-    int64 num_of_items_in_cache_by_name = 2;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "in" and "by" are needed here. --)
+    int64 items_in_cache_by_id_count = 1;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "in" and "by" are needed here. --)
+    int64 items_in_cache_by_name_count = 2;
 }
diff --git a/proto/internal/temporal/server/api/persistenceblobs/v1/message.proto b/proto/internal/temporal/server/api/persistenceblobs/v1/message.proto
index 08c16bc39fb..97122183cad 100644
--- a/proto/internal/temporal/server/api/persistenceblobs/v1/message.proto
+++ b/proto/internal/temporal/server/api/persistenceblobs/v1/message.proto
@@ -56,8 +56,14 @@ message ActivityInfo {
     int64 started_time_nanos = 9;
     string activity_id = 10;
     string request_id = 11;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "to" is used to indicate interval. --)
     int32 schedule_to_start_timeout_seconds = 12;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "to" is used to indicate interval. --)
     int32 schedule_to_close_timeout_seconds = 13;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "to" is used to indicate interval. --)
     int32 start_to_close_timeout_seconds = 14;
     int32 heartbeat_timeout_seconds = 15;
     bool cancel_requested = 16;
@@ -78,7 +84,7 @@ message ActivityInfo {
     string namespace_id = 31;
     int64 schedule_id = 32;
     temporal.api.common.v1.Payloads last_heartbeat_details = 33;
-    google.protobuf.Timestamp last_heartbeat_updated_time = 34;
+    google.protobuf.Timestamp last_heartbeat_update_time = 34;
 }
 
 message ShardInfo {
@@ -87,9 +93,11 @@ message ShardInfo {
     string owner = 3;
     int64 replication_ack_level = 4;
     int64 transfer_ack_level = 5;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "since" is needed here. --)
     int32 stolen_since_renew = 6;
-    google.protobuf.Timestamp updated_at = 7;
-    google.protobuf.Timestamp timer_ack_level = 8;
+    google.protobuf.Timestamp update_time = 7;
+    google.protobuf.Timestamp timer_ack_level_time = 8;
     int64 namespace_notification_version = 9;
     map<string, int64> cluster_transfer_ack_level = 10;
     map<string, google.protobuf.Timestamp> cluster_timer_ack_level = 11;
@@ -127,7 +135,7 @@ message TimerTaskInfo {
     int64 schedule_attempt = 8;
     int64 event_id = 9;
     int64 task_id = 10;
-    google.protobuf.Timestamp visibility_timestamp = 11;
+    google.protobuf.Timestamp visibility_time = 11;
 }
 
 message TransferTaskInfo {
@@ -143,7 +151,7 @@ message TransferTaskInfo {
     int64 schedule_id = 10;
     int64 version = 11;
     int64 task_id = 12;
-    google.protobuf.Timestamp visibility_timestamp = 13;
+    google.protobuf.Timestamp visibility_time = 13;
     bool record_visibility = 14;
 }
 
@@ -186,8 +194,8 @@ message TaskInfo {
     string workflow_id = 2;
     string run_id = 3;
     int64 schedule_id = 4;
-    google.protobuf.Timestamp created_time = 5;
-    google.protobuf.Timestamp expiry = 6;
+    google.protobuf.Timestamp create_time = 5;
+    google.protobuf.Timestamp expiry_time = 6;
 }
 
 message AllocatedTaskInfo {
@@ -201,8 +209,8 @@ message TaskQueueInfo {
     temporal.api.enums.v1.TaskQueueType task_type = 3;
     temporal.api.enums.v1.TaskQueueKind kind = 5;
     int64 ack_level = 6;
-    google.protobuf.Timestamp expiry = 7;
-    google.protobuf.Timestamp last_updated = 8;
+    google.protobuf.Timestamp expiry_time = 7;
+    google.protobuf.Timestamp last_update_time = 8;
 }
 
 message SignalInfo {
@@ -251,7 +259,7 @@ message WorkflowExecutionInfo {
     int64 last_first_event_id = 20;
     int64 last_processed_event = 21;
     int64 start_time_nanos = 22;
-    int64 last_updated_time_nanos = 23;
+    int64 last_update_time_nanos = 23;
     int64 decision_version = 24;
     int64 decision_schedule_id = 25;
     int64 decision_started_id = 26;
@@ -264,6 +272,8 @@ message WorkflowExecutionInfo {
     string decision_request_id = 34;
     string cancel_request_id = 35;
     string sticky_task_queue = 36;
+    // (-- api-linter: core::0140::prepositions=disabled
+    //     aip.dev/not-precedent: "to" is used to indicate interval. --)
     int64 sticky_schedule_to_start_timeout = 37;
     int64 retry_attempt = 38;
     int32 retry_initial_interval_seconds = 39;
@@ -325,7 +335,7 @@ message NamespaceDetail {
 
 message NamespaceInfo {
     string id = 1;
-    temporal.api.enums.v1.NamespaceStatus status = 2;
+    temporal.api.enums.v1.NamespaceState state = 2;
     string name = 3;
     string description = 4;
     string owner = 5;
@@ -342,9 +352,9 @@ message NamespaceConfig {
     bool emit_metric = 2;
     string archival_bucket = 3;
     temporal.api.namespace.v1.BadBinaries bad_binaries = 16;
-    temporal.api.enums.v1.ArchivalStatus history_archival_status = 18;
+    temporal.api.enums.v1.ArchivalState history_archival_state = 18;
     string history_archival_uri = 19;
-    temporal.api.enums.v1.ArchivalStatus visibility_archival_status = 20;
+    temporal.api.enums.v1.ArchivalState visibility_archival_state = 20;
     string visibility_archival_uri = 21;
 }
 
diff --git a/service/frontend/adminHandler.go b/service/frontend/adminHandler.go
index 32d71e1d399..d8f02c7f5a1 100644
--- a/service/frontend/adminHandler.go
+++ b/service/frontend/adminHandler.go
@@ -773,11 +773,11 @@ func (adh *AdminHandler) ReapplyEvents(ctx context.Context, request *adminservic
 	return nil, nil
 }
 
-// ReadDLQMessages reads messages from DLQ
-func (adh *AdminHandler) ReadDLQMessages(
+// GetDLQMessages reads messages from DLQ
+func (adh *AdminHandler) GetDLQMessages(
 	ctx context.Context,
-	request *adminservice.ReadDLQMessagesRequest,
-) (resp *adminservice.ReadDLQMessagesResponse, retErr error) {
+	request *adminservice.GetDLQMessagesRequest,
+) (resp *adminservice.GetDLQMessagesResponse, retErr error) {
 
 	defer log.CapturePanic(adh.GetLogger(), &retErr)
 	scope, sw := adh.startRequestProfile(metrics.AdminReadDLQMessagesScope)
@@ -800,7 +800,7 @@ func (adh *AdminHandler) ReadDLQMessages(
 	var op func() error
 	switch request.GetType() {
 	case enumsspb.DEAD_LETTER_QUEUE_TYPE_REPLICATION:
-		resp, err := adh.GetHistoryClient().ReadDLQMessages(ctx, &historyservice.ReadDLQMessagesRequest{
+		resp, err := adh.GetHistoryClient().GetDLQMessages(ctx, &historyservice.GetDLQMessagesRequest{
 			Type:                  request.GetType(),
 			ShardId:               request.GetShardId(),
 			SourceCluster:         request.GetSourceCluster(),
@@ -813,7 +813,7 @@ func (adh *AdminHandler) ReadDLQMessages(
 			return nil, err
 		}
 
-		return &adminservice.ReadDLQMessagesResponse{
+		return &adminservice.GetDLQMessagesResponse{
 			Type:             resp.GetType(),
 			ReplicationTasks: resp.GetReplicationTasks(),
 			NextPageToken:    resp.GetNextPageToken(),
@@ -840,7 +840,7 @@ func (adh *AdminHandler) ReadDLQMessages(
 		return nil, adh.error(retErr, scope)
 	}
 
-	return &adminservice.ReadDLQMessagesResponse{
+	return &adminservice.GetDLQMessagesResponse{
 		ReplicationTasks: tasks,
 		NextPageToken:    token,
 	}, nil
diff --git a/service/frontend/adminNilCheckHandler.go b/service/frontend/adminNilCheckHandler.go
index 9492c67e513..ca942f937c3 100644
--- a/service/frontend/adminNilCheckHandler.go
+++ b/service/frontend/adminNilCheckHandler.go
@@ -162,11 +162,11 @@ func (adh *AdminNilCheckHandler) ReapplyEvents(ctx context.Context, request *adm
 	return resp, err
 }
 
-// ReadDLQMessages returns messages from DLQ
-func (adh *AdminNilCheckHandler) ReadDLQMessages(ctx context.Context, request *adminservice.ReadDLQMessagesRequest) (*adminservice.ReadDLQMessagesResponse, error) {
-	resp, err := adh.parentHandler.ReadDLQMessages(ctx, request)
+// GetDLQMessages returns messages from DLQ
+func (adh *AdminNilCheckHandler) GetDLQMessages(ctx context.Context, request *adminservice.GetDLQMessagesRequest) (*adminservice.GetDLQMessagesResponse, error) {
+	resp, err := adh.parentHandler.GetDLQMessages(ctx, request)
 	if resp == nil && err == nil {
-		resp = &adminservice.ReadDLQMessagesResponse{}
+		resp = &adminservice.GetDLQMessagesResponse{}
 	}
 	return resp, err
 }
diff --git a/service/frontend/workflowHandler.go b/service/frontend/workflowHandler.go
index 0145c56d1d2..029a346cf75 100644
--- a/service/frontend/workflowHandler.go
+++ b/service/frontend/workflowHandler.go
@@ -217,7 +217,7 @@ func (wh *WorkflowHandler) RegisterNamespace(ctx context.Context, request *workf
 		return nil, errRequestNotSet
 	}
 
-	if request.GetWorkflowExecutionRetentionPeriodInDays() > common.MaxWorkflowRetentionPeriodInDays {
+	if request.GetWorkflowExecutionRetentionPeriodDays() > common.MaxWorkflowRetentionPeriodInDays {
 		return nil, errInvalidRetention
 	}
 
@@ -589,7 +589,7 @@ func (wh *WorkflowHandler) GetWorkflowExecutionHistory(ctx context.Context, requ
 			nil
 	}
 
-	isLongPoll := request.GetWaitForNewEvent()
+	isLongPoll := request.GetWaitNewEvent()
 	isCloseEventOnly := request.GetHistoryEventFilterType() == enumspb.HISTORY_EVENT_FILTER_TYPE_CLOSE_EVENT
 	execution := request.Execution
 	var continuationToken *tokenspb.HistoryContinuation
@@ -1108,22 +1108,22 @@ func (wh *WorkflowHandler) PollForActivityTask(ctx context.Context, request *wor
 	}
 
 	return &workflowservice.PollForActivityTaskResponse{
-		TaskToken:                       matchingResponse.TaskToken,
-		WorkflowExecution:               matchingResponse.WorkflowExecution,
-		ActivityId:                      matchingResponse.ActivityId,
-		ActivityType:                    matchingResponse.ActivityType,
-		Input:                           matchingResponse.Input,
-		ScheduledTimestamp:              matchingResponse.ScheduledTimestamp,
-		ScheduleToCloseTimeoutSeconds:   matchingResponse.ScheduleToCloseTimeoutSeconds,
-		StartedTimestamp:                matchingResponse.StartedTimestamp,
-		StartToCloseTimeoutSeconds:      matchingResponse.StartToCloseTimeoutSeconds,
-		HeartbeatTimeoutSeconds:         matchingResponse.HeartbeatTimeoutSeconds,
-		Attempt:                         matchingResponse.Attempt,
-		ScheduledTimestampOfThisAttempt: matchingResponse.ScheduledTimestampOfThisAttempt,
-		HeartbeatDetails:                matchingResponse.HeartbeatDetails,
-		WorkflowType:                    matchingResponse.WorkflowType,
-		WorkflowNamespace:               matchingResponse.WorkflowNamespace,
-		Header:                          matchingResponse.Header,
+		TaskToken:                     matchingResponse.TaskToken,
+		WorkflowExecution:             matchingResponse.WorkflowExecution,
+		ActivityId:                    matchingResponse.ActivityId,
+		ActivityType:                  matchingResponse.ActivityType,
+		Input:                         matchingResponse.Input,
+		ScheduledTimestamp:            matchingResponse.ScheduledTimestamp,
+		ScheduleToCloseTimeoutSeconds: matchingResponse.ScheduleToCloseTimeoutSeconds,
+		StartedTimestamp:              matchingResponse.StartedTimestamp,
+		StartToCloseTimeoutSeconds:    matchingResponse.StartToCloseTimeoutSeconds,
+		HeartbeatTimeoutSeconds:       matchingResponse.HeartbeatTimeoutSeconds,
+		Attempt:                       matchingResponse.Attempt,
+		ScheduledTimestampThisAttempt: matchingResponse.ScheduledTimestampOfThisAttempt,
+		HeartbeatDetails:              matchingResponse.HeartbeatDetails,
+		WorkflowType:                  matchingResponse.WorkflowType,
+		WorkflowNamespace:             matchingResponse.WorkflowNamespace,
+		Header:                        matchingResponse.Header,
 	}, nil
 }
 
@@ -2616,7 +2616,7 @@ func (wh *WorkflowHandler) ListArchivedWorkflowExecutions(ctx context.Context, r
 		return nil, wh.error(err, scope)
 	}
 
-	if entry.GetConfig().VisibilityArchivalStatus != enumspb.ARCHIVAL_STATUS_ENABLED {
+	if entry.GetConfig().VisibilityArchivalState != enumspb.ARCHIVAL_STATE_ENABLED {
 		return nil, wh.error(errNamespaceIsNotConfiguredForVisibilityArchival, scope)
 	}
 
diff --git a/service/frontend/workflowHandler_test.go b/service/frontend/workflowHandler_test.go
index c0c689d82cf..1ad4f95f0d7 100644
--- a/service/frontend/workflowHandler_test.go
+++ b/service/frontend/workflowHandler_test.go
@@ -492,9 +492,9 @@ func (s *workflowHandlerSuite) TestRegisterNamespace_Failure_InvalidArchivalURI(
 	wh := s.getWorkflowHandler(s.newConfig())
 
 	req := registerNamespaceRequest(
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testHistoryArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testVisibilityArchivalURI,
 	)
 	_, err := wh.RegisterNamespace(context.Background(), req)
@@ -518,7 +518,7 @@ func (s *workflowHandlerSuite) TestRegisterNamespace_Success_EnabledWithNoArchiv
 
 	wh := s.getWorkflowHandler(s.newConfig())
 
-	req := registerNamespaceRequest(enumspb.ARCHIVAL_STATUS_ENABLED, "", enumspb.ARCHIVAL_STATUS_ENABLED, "")
+	req := registerNamespaceRequest(enumspb.ARCHIVAL_STATE_ENABLED, "", enumspb.ARCHIVAL_STATE_ENABLED, "")
 	_, err := wh.RegisterNamespace(context.Background(), req)
 	s.NoError(err)
 }
@@ -541,9 +541,9 @@ func (s *workflowHandlerSuite) TestRegisterNamespace_Success_EnabledWithArchival
 	wh := s.getWorkflowHandler(s.newConfig())
 
 	req := registerNamespaceRequest(
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testHistoryArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testVisibilityArchivalURI,
 	)
 	_, err := wh.RegisterNamespace(context.Background(), req)
@@ -564,9 +564,9 @@ func (s *workflowHandlerSuite) TestRegisterNamespace_Success_ClusterNotConfigure
 	wh := s.getWorkflowHandler(s.newConfig())
 
 	req := registerNamespaceRequest(
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testVisibilityArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		"invalidURI",
 	)
 	_, err := wh.RegisterNamespace(context.Background(), req)
@@ -586,15 +586,15 @@ func (s *workflowHandlerSuite) TestRegisterNamespace_Success_NotEnabled() {
 
 	wh := s.getWorkflowHandler(s.newConfig())
 
-	req := registerNamespaceRequest(enumspb.ARCHIVAL_STATUS_UNSPECIFIED, "", enumspb.ARCHIVAL_STATUS_UNSPECIFIED, "")
+	req := registerNamespaceRequest(enumspb.ARCHIVAL_STATE_UNSPECIFIED, "", enumspb.ARCHIVAL_STATE_UNSPECIFIED, "")
 	_, err := wh.RegisterNamespace(context.Background(), req)
 	s.NoError(err)
 }
 
 func (s *workflowHandlerSuite) TestDescribeNamespace_Success_ArchivalDisabled() {
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 
@@ -608,16 +608,16 @@ func (s *workflowHandlerSuite) TestDescribeNamespace_Success_ArchivalDisabled()
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetHistoryArchivalState())
 	s.Equal("", result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal("", result.Config.GetVisibilityArchivalUri())
 }
 
 func (s *workflowHandlerSuite) TestDescribeNamespace_Success_ArchivalEnabled() {
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testHistoryArchivalURI},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testVisibilityArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testHistoryArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testVisibilityArchivalURI},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 
@@ -631,9 +631,9 @@ func (s *workflowHandlerSuite) TestDescribeNamespace_Success_ArchivalEnabled() {
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetHistoryArchivalState())
 	s.Equal(testHistoryArchivalURI, result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal(testVisibilityArchivalURI, result.Config.GetVisibilityArchivalUri())
 }
 
@@ -642,8 +642,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Failure_UpdateExistingArchiva
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testHistoryArchivalURI},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testVisibilityArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testHistoryArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testVisibilityArchivalURI},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockArchivalMetadata.On("GetHistoryConfig").Return(archiver.NewArchivalConfig("enabled", dc.GetStringPropertyFn("enabled"), dc.GetBoolPropertyFn(true), "disabled", "some random URI"))
@@ -655,9 +655,9 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Failure_UpdateExistingArchiva
 
 	updateReq := updateRequest(
 		"",
-		enumspb.ARCHIVAL_STATUS_UNSPECIFIED,
+		enumspb.ARCHIVAL_STATE_UNSPECIFIED,
 		"updated visibility URI",
-		enumspb.ARCHIVAL_STATUS_UNSPECIFIED,
+		enumspb.ARCHIVAL_STATE_UNSPECIFIED,
 	)
 	_, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.Error(err)
@@ -668,8 +668,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Failure_InvalidArchivalURI()
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockArchivalMetadata.On("GetHistoryConfig").Return(archiver.NewArchivalConfig("enabled", dc.GetStringPropertyFn("enabled"), dc.GetBoolPropertyFn(true), "disabled", "some random URI"))
@@ -680,9 +680,9 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Failure_InvalidArchivalURI()
 
 	updateReq := updateRequest(
 		"testScheme://invalid/updated/history/URI",
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		"",
-		enumspb.ARCHIVAL_STATUS_UNSPECIFIED,
+		enumspb.ARCHIVAL_STATE_UNSPECIFIED,
 	)
 	_, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.Error(err)
@@ -693,8 +693,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToArch
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testHistoryArchivalURI},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testVisibilityArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testHistoryArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testVisibilityArchivalURI},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockMetadataMgr.On("UpdateNamespace", mock.Anything).Return(nil)
@@ -711,17 +711,17 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToArch
 
 	updateReq := updateRequest(
 		"",
-		enumspb.ARCHIVAL_STATUS_DISABLED,
+		enumspb.ARCHIVAL_STATE_DISABLED,
 		"",
-		enumspb.ARCHIVAL_STATUS_DISABLED,
+		enumspb.ARCHIVAL_STATE_DISABLED,
 	)
 	result, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetHistoryArchivalState())
 	s.Equal(testHistoryArchivalURI, result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal(testVisibilityArchivalURI, result.Config.GetVisibilityArchivalUri())
 }
 
@@ -730,8 +730,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ClusterNotConfiguredF
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: "some random history URI"},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: "some random visibility URI"},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: "some random history URI"},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: "some random visibility URI"},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockClusterMetadata.EXPECT().GetAllClusterInfo().Return(cluster.TestAllClusterInfo).AnyTimes()
@@ -741,14 +741,14 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ClusterNotConfiguredF
 
 	wh := s.getWorkflowHandler(s.newConfig())
 
-	updateReq := updateRequest("", enumspb.ARCHIVAL_STATUS_DISABLED, "", enumspb.ARCHIVAL_STATUS_UNSPECIFIED)
+	updateReq := updateRequest("", enumspb.ARCHIVAL_STATE_DISABLED, "", enumspb.ARCHIVAL_STATE_UNSPECIFIED)
 	result, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetHistoryArchivalState())
 	s.Equal("some random history URI", result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal("some random visibility URI", result.Config.GetVisibilityArchivalUri())
 }
 
@@ -757,8 +757,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToArch
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testHistoryArchivalURI},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testVisibilityArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testHistoryArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testVisibilityArchivalURI},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockMetadataMgr.On("UpdateNamespace", mock.Anything).Return(nil)
@@ -775,17 +775,17 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToArch
 
 	updateReq := updateRequest(
 		testHistoryArchivalURI,
-		enumspb.ARCHIVAL_STATUS_DISABLED,
+		enumspb.ARCHIVAL_STATE_DISABLED,
 		testVisibilityArchivalURI,
-		enumspb.ARCHIVAL_STATUS_DISABLED,
+		enumspb.ARCHIVAL_STATE_DISABLED,
 	)
 	result, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetHistoryArchivalState())
 	s.Equal(testHistoryArchivalURI, result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_DISABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_DISABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal(testVisibilityArchivalURI, result.Config.GetVisibilityArchivalUri())
 }
 
@@ -794,8 +794,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToEnab
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testHistoryArchivalURI},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_ENABLED, URI: testVisibilityArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testHistoryArchivalURI},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_ENABLED, URI: testVisibilityArchivalURI},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockClusterMetadata.EXPECT().GetAllClusterInfo().Return(cluster.TestAllClusterInfo).AnyTimes()
@@ -811,17 +811,17 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalEnabledToEnab
 
 	updateReq := updateRequest(
 		testHistoryArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testVisibilityArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 	)
 	result, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetHistoryArchivalState())
 	s.Equal(testHistoryArchivalURI, result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal(testVisibilityArchivalURI, result.Config.GetVisibilityArchivalUri())
 }
 
@@ -830,8 +830,8 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalNeverEnabledT
 		NotificationVersion: int64(0),
 	}, nil)
 	getNamespaceResp := persistenceGetNamespaceResponse(
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
-		&namespace.ArchivalState{Status: enumspb.ARCHIVAL_STATUS_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
+		&namespace.ArchivalState{State: enumspb.ARCHIVAL_STATE_DISABLED, URI: ""},
 	)
 	s.mockMetadataMgr.On("GetNamespace", mock.Anything).Return(getNamespaceResp, nil)
 	s.mockMetadataMgr.On("UpdateNamespace", mock.Anything).Return(nil)
@@ -848,17 +848,17 @@ func (s *workflowHandlerSuite) TestUpdateNamespace_Success_ArchivalNeverEnabledT
 
 	updateReq := updateRequest(
 		testHistoryArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 		testVisibilityArchivalURI,
-		enumspb.ARCHIVAL_STATUS_ENABLED,
+		enumspb.ARCHIVAL_STATE_ENABLED,
 	)
 	result, err := wh.UpdateNamespace(context.Background(), updateReq)
 	s.NoError(err)
 	s.NotNil(result)
 	s.NotNil(result.Config)
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetHistoryArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetHistoryArchivalState())
 	s.Equal(testHistoryArchivalURI, result.Config.GetHistoryArchivalUri())
-	s.Equal(enumspb.ARCHIVAL_STATUS_ENABLED, result.Config.GetVisibilityArchivalStatus())
+	s.Equal(enumspb.ARCHIVAL_STATE_ENABLED, result.Config.GetVisibilityArchivalState())
 	s.Equal(testVisibilityArchivalURI, result.Config.GetVisibilityArchivalUri())
 }
 
@@ -915,10 +915,10 @@ func (s *workflowHandlerSuite) TestGetArchivedHistory_Failure_ArchivalURIEmpty()
 	namespaceEntry := cache.NewLocalNamespaceCacheEntryForTest(
 		&persistenceblobs.NamespaceInfo{Name: "test-namespace"},
 		&persistenceblobs.NamespaceConfig{
-			HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_DISABLED,
-			HistoryArchivalUri:       "",
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-			VisibilityArchivalUri:    "",
+			HistoryArchivalState:    enumspb.ARCHIVAL_STATE_DISABLED,
+			HistoryArchivalUri:      "",
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+			VisibilityArchivalUri:   "",
 		},
 		"",
 		nil)
@@ -935,10 +935,10 @@ func (s *workflowHandlerSuite) TestGetArchivedHistory_Failure_InvalidURI() {
 	namespaceEntry := cache.NewLocalNamespaceCacheEntryForTest(
 		&persistenceblobs.NamespaceInfo{Name: "test-namespace"},
 		&persistenceblobs.NamespaceConfig{
-			HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_ENABLED,
-			HistoryArchivalUri:       "uri without scheme",
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-			VisibilityArchivalUri:    "",
+			HistoryArchivalState:    enumspb.ARCHIVAL_STATE_ENABLED,
+			HistoryArchivalUri:      "uri without scheme",
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+			VisibilityArchivalUri:   "",
 		},
 		"",
 		nil)
@@ -955,10 +955,10 @@ func (s *workflowHandlerSuite) TestGetArchivedHistory_Success_GetFirstPage() {
 	namespaceEntry := cache.NewLocalNamespaceCacheEntryForTest(
 		&persistenceblobs.NamespaceInfo{Name: "test-namespace"},
 		&persistenceblobs.NamespaceConfig{
-			HistoryArchivalStatus:    enumspb.ARCHIVAL_STATUS_ENABLED,
-			HistoryArchivalUri:       testHistoryArchivalURI,
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-			VisibilityArchivalUri:    "",
+			HistoryArchivalState:    enumspb.ARCHIVAL_STATE_ENABLED,
+			HistoryArchivalUri:      testHistoryArchivalURI,
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+			VisibilityArchivalUri:   "",
 		},
 		"",
 		nil)
@@ -1069,7 +1069,7 @@ func (s *workflowHandlerSuite) TestListArchivedVisibility_Failure_NamespaceNotCo
 	s.mockNamespaceCache.EXPECT().GetNamespace(gomock.Any()).Return(cache.NewLocalNamespaceCacheEntryForTest(
 		nil,
 		&persistenceblobs.NamespaceConfig{
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
 		},
 		"",
 		nil,
@@ -1087,8 +1087,8 @@ func (s *workflowHandlerSuite) TestListArchivedVisibility_Failure_InvalidURI() {
 	s.mockNamespaceCache.EXPECT().GetNamespace(gomock.Any()).Return(cache.NewLocalNamespaceCacheEntryForTest(
 		&persistenceblobs.NamespaceInfo{Name: "test-namespace"},
 		&persistenceblobs.NamespaceConfig{
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_DISABLED,
-			VisibilityArchivalUri:    "uri without scheme",
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_DISABLED,
+			VisibilityArchivalUri:   "uri without scheme",
 		},
 		"",
 		nil,
@@ -1106,8 +1106,8 @@ func (s *workflowHandlerSuite) TestListArchivedVisibility_Success() {
 	s.mockNamespaceCache.EXPECT().GetNamespace(gomock.Any()).Return(cache.NewLocalNamespaceCacheEntryForTest(
 		&persistenceblobs.NamespaceInfo{Name: "test-namespace"},
 		&persistenceblobs.NamespaceConfig{
-			VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_ENABLED,
-			VisibilityArchivalUri:    testVisibilityArchivalURI,
+			VisibilityArchivalState: enumspb.ARCHIVAL_STATE_ENABLED,
+			VisibilityArchivalUri:   testVisibilityArchivalURI,
 		},
 		"",
 		nil,
@@ -1338,17 +1338,17 @@ func (s *workflowHandlerSuite) newConfig() *Config {
 
 func updateRequest(
 	historyArchivalURI string,
-	historyArchivalStatus enumspb.ArchivalStatus,
+	historyArchivalState enumspb.ArchivalState,
 	visibilityArchivalURI string,
-	visibilityArchivalStatus enumspb.ArchivalStatus,
+	visibilityArchivalState enumspb.ArchivalState,
 ) *workflowservice.UpdateNamespaceRequest {
 	return &workflowservice.UpdateNamespaceRequest{
 		Name: "test-name",
 		Config: &namespacepb.NamespaceConfig{
-			HistoryArchivalStatus:    historyArchivalStatus,
-			HistoryArchivalUri:       historyArchivalURI,
-			VisibilityArchivalStatus: visibilityArchivalStatus,
-			VisibilityArchivalUri:    visibilityArchivalURI,
+			HistoryArchivalState:    historyArchivalState,
+			HistoryArchivalUri:      historyArchivalURI,
+			VisibilityArchivalState: visibilityArchivalState,
+			VisibilityArchivalUri:   visibilityArchivalURI,
 		},
 	}
 }
@@ -1359,18 +1359,18 @@ func persistenceGetNamespaceResponse(historyArchivalState, visibilityArchivalSta
 			Info: &persistenceblobs.NamespaceInfo{
 				Id:          testNamespaceID,
 				Name:        "test-name",
-				Status:      0,
+				State:       0,
 				Description: "test-description",
 				Owner:       "test-owner-email",
 				Data:        make(map[string]string),
 			},
 			Config: &persistenceblobs.NamespaceConfig{
-				RetentionDays:            1,
-				EmitMetric:               true,
-				HistoryArchivalStatus:    historyArchivalState.Status,
-				HistoryArchivalUri:       historyArchivalState.URI,
-				VisibilityArchivalStatus: visibilityArchivalState.Status,
-				VisibilityArchivalUri:    visibilityArchivalState.URI,
+				RetentionDays:           1,
+				EmitMetric:              true,
+				HistoryArchivalState:    historyArchivalState.State,
+				HistoryArchivalUri:      historyArchivalState.URI,
+				VisibilityArchivalState: visibilityArchivalState.State,
+				VisibilityArchivalUri:   visibilityArchivalState.URI,
 			},
 			ReplicationConfig: &persistenceblobs.NamespaceReplicationConfig{
 				ActiveClusterName: cluster.TestCurrentClusterName,
@@ -1388,30 +1388,30 @@ func persistenceGetNamespaceResponse(historyArchivalState, visibilityArchivalSta
 }
 
 func registerNamespaceRequest(
-	historyArchivalStatus enumspb.ArchivalStatus,
+	historyArchivalState enumspb.ArchivalState,
 	historyArchivalURI string,
-	visibilityArchivalStatus enumspb.ArchivalStatus,
+	visibilityArchivalState enumspb.ArchivalState,
 	visibilityArchivalURI string,
 ) *workflowservice.RegisterNamespaceRequest {
 	return &workflowservice.RegisterNamespaceRequest{
-		Name:                                   "test-namespace",
-		Description:                            "test-description",
-		OwnerEmail:                             "test-owner-email",
-		WorkflowExecutionRetentionPeriodInDays: 10,
-		EmitMetric:                             true,
+		Name:                                 "test-namespace",
+		Description:                          "test-description",
+		OwnerEmail:                           "test-owner-email",
+		WorkflowExecutionRetentionPeriodDays: 10,
+		EmitMetric:                           true,
 		Clusters: []*replicationpb.ClusterReplicationConfig{
 			{
 				ClusterName: cluster.TestCurrentClusterName,
 			},
 		},
-		ActiveClusterName:        cluster.TestCurrentClusterName,
-		Data:                     make(map[string]string),
-		SecurityToken:            "token",
-		HistoryArchivalStatus:    historyArchivalStatus,
-		HistoryArchivalUri:       historyArchivalURI,
-		VisibilityArchivalStatus: visibilityArchivalStatus,
-		VisibilityArchivalUri:    visibilityArchivalURI,
-		IsGlobalNamespace:        false,
+		ActiveClusterName:       cluster.TestCurrentClusterName,
+		Data:                    make(map[string]string),
+		SecurityToken:           "token",
+		HistoryArchivalState:    historyArchivalState,
+		HistoryArchivalUri:      historyArchivalURI,
+		VisibilityArchivalState: visibilityArchivalState,
+		VisibilityArchivalUri:   visibilityArchivalURI,
+		IsGlobalNamespace:       false,
 	}
 }
 
diff --git a/service/history/decisionChecker.go b/service/history/decisionChecker.go
index 119a929c45a..fda0493e1ec 100644
--- a/service/history/decisionChecker.go
+++ b/service/history/decisionChecker.go
@@ -149,7 +149,7 @@ func (c *workflowSizeChecker) failWorkflowIfPayloadSizeExceedsLimit(
 		Failure: failure.NewServerFailure(message, true),
 	}
 
-	if _, err := c.mutableState.AddFailWorkflowEvent(c.completedID, enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE, attributes); err != nil {
+	if _, err := c.mutableState.AddFailWorkflowEvent(c.completedID, enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE, attributes); err != nil {
 		return false, err
 	}
 
@@ -173,7 +173,7 @@ func (c *workflowSizeChecker) failWorkflowSizeExceedsLimit() (bool, error) {
 			Failure: failure.NewServerFailure(common.FailureReasonSizeExceedsLimit, true),
 		}
 
-		if _, err := c.mutableState.AddFailWorkflowEvent(c.completedID, enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE, attributes); err != nil {
+		if _, err := c.mutableState.AddFailWorkflowEvent(c.completedID, enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE, attributes); err != nil {
 			return false, err
 		}
 		return true, nil
diff --git a/service/history/decisionTaskHandler.go b/service/history/decisionTaskHandler.go
index 704e7f3c2b9..1bd827b46db 100644
--- a/service/history/decisionTaskHandler.go
+++ b/service/history/decisionTaskHandler.go
@@ -443,7 +443,7 @@ func (handler *decisionTaskHandlerImpl) handleDecisionFailWorkflow(
 	}
 
 	// below will check whether to do continue as new based on backoff & backoff or cron
-	backoffInterval, retryStatus := handler.mutableState.GetRetryBackoffDuration(attr.GetFailure())
+	backoffInterval, retryState := handler.mutableState.GetRetryBackoffDuration(attr.GetFailure())
 	continueAsNewInitiator := enumspb.CONTINUE_AS_NEW_INITIATOR_RETRY
 	// first check the backoff retry
 	if backoffInterval == backoff.NoBackoff {
@@ -458,7 +458,7 @@ func (handler *decisionTaskHandlerImpl) handleDecisionFailWorkflow(
 	// second check the backoff / cron schedule
 	if backoffInterval == backoff.NoBackoff {
 		// no retry or cron
-		if _, err := handler.mutableState.AddFailWorkflowEvent(handler.decisionTaskCompletedID, retryStatus, attr); err != nil {
+		if _, err := handler.mutableState.AddFailWorkflowEvent(handler.decisionTaskCompletedID, retryState, attr); err != nil {
 			return err
 		}
 		return nil
@@ -672,7 +672,7 @@ func (handler *decisionTaskHandlerImpl) handleDecisionContinueAsNewWorkflow(
 		// TODO(maxim): is decisionTaskCompletedID the correct id?
 		// TODO(maxim): should we introduce new TimeoutTypes (Workflow, Run) for workflows?
 		handler.stopProcessing = true
-		_, err := handler.mutableState.AddTimeoutWorkflowEvent(handler.decisionTaskCompletedID, enumspb.RETRY_STATUS_TIMEOUT)
+		_, err := handler.mutableState.AddTimeoutWorkflowEvent(handler.decisionTaskCompletedID, enumspb.RETRY_STATE_TIMEOUT)
 		return err
 	}
 	handler.logger.Debug("!!!! Continued as new without timeout",
diff --git a/service/history/handler.go b/service/history/handler.go
index 04455ff71c8..b23657333e8 100644
--- a/service/history/handler.go
+++ b/service/history/handler.go
@@ -666,7 +666,7 @@ func (h *Handler) DescribeHistoryHost(_ context.Context, _ *historyservice.Descr
 	defer log.CapturePanic(h.GetLogger(), &retError)
 	h.startWG.Wait()
 
-	numOfItemsInCacheByID, numOfItemsInCacheByName := h.GetNamespaceCache().GetCacheSize()
+	itemsInCacheByIDCount, itemsInCacheByNameCount := h.GetNamespaceCache().GetCacheSize()
 	status := ""
 	switch atomic.LoadInt32(&h.controller.status) {
 	case common.DaemonStatusInitialized:
@@ -681,8 +681,8 @@ func (h *Handler) DescribeHistoryHost(_ context.Context, _ *historyservice.Descr
 		NumberOfShards: int32(h.controller.numShards()),
 		ShardIds:       h.controller.shardIDs(),
 		NamespaceCache: &namespacespb.NamespaceCacheInfo{
-			NumOfItemsInCacheById:   numOfItemsInCacheByID,
-			NumOfItemsInCacheByName: numOfItemsInCacheByName,
+			ItemsInCacheByIdCount:   itemsInCacheByIDCount,
+			ItemsInCacheByNameCount: itemsInCacheByNameCount,
 		},
 		ShardControllerStatus: status,
 		Address:               h.GetHostInfo().GetAddress(),
@@ -1643,7 +1643,7 @@ func (h *Handler) ReapplyEvents(ctx context.Context, request *historyservice.Rea
 	return &historyservice.ReapplyEventsResponse{}, nil
 }
 
-func (h *Handler) ReadDLQMessages(ctx context.Context, request *historyservice.ReadDLQMessagesRequest) (_ *historyservice.ReadDLQMessagesResponse, retError error) {
+func (h *Handler) GetDLQMessages(ctx context.Context, request *historyservice.GetDLQMessagesRequest) (_ *historyservice.GetDLQMessagesResponse, retError error) {
 	defer log.CapturePanic(h.GetLogger(), &retError)
 
 	h.startWG.Wait()
@@ -1663,7 +1663,7 @@ func (h *Handler) ReadDLQMessages(ctx context.Context, request *historyservice.R
 		return nil, err
 	}
 
-	resp, err := engine.ReadDLQMessages(ctx, request)
+	resp, err := engine.GetDLQMessages(ctx, request)
 	if err != nil {
 		err = h.error(err, scope, "", "")
 		return nil, err
diff --git a/service/history/historyBuilder.go b/service/history/historyBuilder.go
index 87427fdc65b..80b2fc8aa45 100644
--- a/service/history/historyBuilder.go
+++ b/service/history/historyBuilder.go
@@ -161,8 +161,8 @@ func (b *historyBuilder) AddActivityTaskCompletedEvent(scheduleEventID, startedE
 }
 
 func (b *historyBuilder) AddActivityTaskFailedEvent(scheduleEventID, startedEventID int64,
-	failure *failurepb.Failure, retryStatus enumspb.RetryStatus, identity string) *historypb.HistoryEvent {
-	event := b.newActivityTaskFailedEvent(scheduleEventID, startedEventID, failure, retryStatus, identity)
+	failure *failurepb.Failure, retryState enumspb.RetryState, identity string) *historypb.HistoryEvent {
+	event := b.newActivityTaskFailedEvent(scheduleEventID, startedEventID, failure, retryState, identity)
 
 	return b.addEventToHistory(event)
 }
@@ -171,9 +171,9 @@ func (b *historyBuilder) AddActivityTaskTimedOutEvent(
 	scheduleEventID,
 	startedEventID int64,
 	timeoutFailure *failurepb.Failure,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) *historypb.HistoryEvent {
-	event := b.newActivityTaskTimedOutEvent(scheduleEventID, startedEventID, timeoutFailure, retryStatus)
+	event := b.newActivityTaskTimedOutEvent(scheduleEventID, startedEventID, timeoutFailure, retryState)
 
 	return b.addEventToHistory(event)
 }
@@ -185,15 +185,15 @@ func (b *historyBuilder) AddCompletedWorkflowEvent(decisionCompletedEventID int6
 	return b.addEventToHistory(event)
 }
 
-func (b *historyBuilder) AddFailWorkflowEvent(decisionCompletedEventID int64, retryStatus enumspb.RetryStatus,
+func (b *historyBuilder) AddFailWorkflowEvent(decisionCompletedEventID int64, retryState enumspb.RetryState,
 	attributes *decisionpb.FailWorkflowExecutionDecisionAttributes) *historypb.HistoryEvent {
-	event := b.newFailWorkflowExecutionEvent(decisionCompletedEventID, retryStatus, attributes)
+	event := b.newFailWorkflowExecutionEvent(decisionCompletedEventID, retryState, attributes)
 
 	return b.addEventToHistory(event)
 }
 
-func (b *historyBuilder) AddTimeoutWorkflowEvent(retryStatus enumspb.RetryStatus) *historypb.HistoryEvent {
-	event := b.newTimeoutWorkflowExecutionEvent(retryStatus)
+func (b *historyBuilder) AddTimeoutWorkflowEvent(retryState enumspb.RetryState) *historypb.HistoryEvent {
+	event := b.newTimeoutWorkflowExecutionEvent(retryState)
 
 	return b.addEventToHistory(event)
 }
@@ -624,14 +624,14 @@ func (b *historyBuilder) newActivityTaskCompletedEvent(scheduleEventID, startedE
 func (b *historyBuilder) newActivityTaskTimedOutEvent(
 	scheduleEventID, startedEventID int64,
 	timeoutFailure *failurepb.Failure,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) *historypb.HistoryEvent {
 	historyEvent := b.msBuilder.CreateNewHistoryEvent(enumspb.EVENT_TYPE_ACTIVITY_TASK_TIMED_OUT)
 	attributes := &historypb.ActivityTaskTimedOutEventAttributes{}
 	attributes.ScheduledEventId = scheduleEventID
 	attributes.StartedEventId = startedEventID
 	attributes.Failure = timeoutFailure
-	attributes.RetryStatus = retryStatus
+	attributes.RetryState = retryState
 
 	historyEvent.Attributes = &historypb.HistoryEvent_ActivityTaskTimedOutEventAttributes{ActivityTaskTimedOutEventAttributes: attributes}
 
@@ -639,11 +639,11 @@ func (b *historyBuilder) newActivityTaskTimedOutEvent(
 }
 
 func (b *historyBuilder) newActivityTaskFailedEvent(scheduleEventID, startedEventID int64,
-	failure *failurepb.Failure, retryStatus enumspb.RetryStatus, identity string) *historypb.HistoryEvent {
+	failure *failurepb.Failure, retryState enumspb.RetryState, identity string) *historypb.HistoryEvent {
 	historyEvent := b.msBuilder.CreateNewHistoryEvent(enumspb.EVENT_TYPE_ACTIVITY_TASK_FAILED)
 	attributes := &historypb.ActivityTaskFailedEventAttributes{}
 	attributes.Failure = failure
-	attributes.RetryStatus = retryStatus
+	attributes.RetryState = retryState
 	attributes.ScheduledEventId = scheduleEventID
 	attributes.StartedEventId = startedEventID
 	attributes.Identity = identity
@@ -663,22 +663,22 @@ func (b *historyBuilder) newCompleteWorkflowExecutionEvent(decisionTaskCompleted
 	return historyEvent
 }
 
-func (b *historyBuilder) newFailWorkflowExecutionEvent(decisionTaskCompletedEventID int64, retryStatus enumspb.RetryStatus,
+func (b *historyBuilder) newFailWorkflowExecutionEvent(decisionTaskCompletedEventID int64, retryState enumspb.RetryState,
 	request *decisionpb.FailWorkflowExecutionDecisionAttributes) *historypb.HistoryEvent {
 	historyEvent := b.msBuilder.CreateNewHistoryEvent(enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_FAILED)
 	attributes := &historypb.WorkflowExecutionFailedEventAttributes{}
 	attributes.Failure = request.GetFailure()
-	attributes.RetryStatus = retryStatus
+	attributes.RetryState = retryState
 	attributes.DecisionTaskCompletedEventId = decisionTaskCompletedEventID
 	historyEvent.Attributes = &historypb.HistoryEvent_WorkflowExecutionFailedEventAttributes{WorkflowExecutionFailedEventAttributes: attributes}
 
 	return historyEvent
 }
 
-func (b *historyBuilder) newTimeoutWorkflowExecutionEvent(retryStatus enumspb.RetryStatus) *historypb.HistoryEvent {
+func (b *historyBuilder) newTimeoutWorkflowExecutionEvent(retryState enumspb.RetryState) *historypb.HistoryEvent {
 	historyEvent := b.msBuilder.CreateNewHistoryEvent(enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIMED_OUT)
 	attributes := &historypb.WorkflowExecutionTimedOutEventAttributes{}
-	attributes.RetryStatus = retryStatus
+	attributes.RetryState = retryState
 	historyEvent.Attributes = &historypb.HistoryEvent_WorkflowExecutionTimedOutEventAttributes{WorkflowExecutionTimedOutEventAttributes: attributes}
 
 	return historyEvent
@@ -970,7 +970,7 @@ func (b *historyBuilder) newChildWorkflowExecutionFailedEvent(namespace string,
 	attributes.InitiatedEventId = initiatedID
 	attributes.StartedEventId = startedID
 	attributes.Failure = failedAttributes.GetFailure()
-	attributes.RetryStatus = failedAttributes.GetRetryStatus()
+	attributes.RetryState = failedAttributes.GetRetryState()
 	historyEvent.Attributes = &historypb.HistoryEvent_ChildWorkflowExecutionFailedEventAttributes{ChildWorkflowExecutionFailedEventAttributes: attributes}
 
 	return historyEvent
@@ -1017,7 +1017,7 @@ func (b *historyBuilder) newChildWorkflowExecutionTimedOutEvent(namespace string
 	attributes.WorkflowType = workflowType
 	attributes.InitiatedEventId = initiatedID
 	attributes.StartedEventId = startedID
-	attributes.RetryStatus = timedOutAttributes.GetRetryStatus()
+	attributes.RetryState = timedOutAttributes.GetRetryState()
 	historyEvent.Attributes = &historypb.HistoryEvent_ChildWorkflowExecutionTimedOutEventAttributes{ChildWorkflowExecutionTimedOutEventAttributes: attributes}
 
 	return historyEvent
diff --git a/service/history/historyBuilder_test.go b/service/history/historyBuilder_test.go
index 4ff7549a4f5..6873a94728c 100644
--- a/service/history/historyBuilder_test.go
+++ b/service/history/historyBuilder_test.go
@@ -250,10 +250,10 @@ func (s *historyBuilderSuite) TestHistoryBuilderDynamicSuccess() {
 	s.Equal(int64(11), ai4.StartedID)
 	s.Equal(int64(3), s.getPreviousDecisionStartedEventID())
 
-	activity2FailedEvent := s.addActivityTaskFailedEvent(6, 11, activity2Failure, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, identity)
-	s.validateActivityTaskFailedEvent(activity2FailedEvent, common.BufferedEventID, 6, 11, activity2Failure, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, identity)
+	activity2FailedEvent := s.addActivityTaskFailedEvent(6, 11, activity2Failure, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, identity)
+	s.validateActivityTaskFailedEvent(activity2FailedEvent, common.BufferedEventID, 6, 11, activity2Failure, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, identity)
 	s.Nil(s.msBuilder.FlushBufferedEvents())
-	s.validateActivityTaskFailedEvent(activity2FailedEvent, 12, 6, 11, activity2Failure, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, identity)
+	s.validateActivityTaskFailedEvent(activity2FailedEvent, 12, 6, 11, activity2Failure, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, identity)
 	s.Equal(int64(13), s.getNextEventID())
 	_, activity2Running3 := s.msBuilder.GetActivityInfo(6)
 	s.False(activity2Running3)
@@ -595,8 +595,8 @@ func (s *historyBuilderSuite) TestHistoryBuilderFlushBufferedEvents() {
 
 	// 12 (buffered) activity2 failed
 	activity2Failure := failure.NewServerFailure("flush-buffered-events-activity2-failed", false)
-	activity2FailedEvent := s.addActivityTaskFailedEvent(6, common.BufferedEventID, activity2Failure, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, identity)
-	s.validateActivityTaskFailedEvent(activity2FailedEvent, common.BufferedEventID, 6, common.BufferedEventID, activity2Failure, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, identity)
+	activity2FailedEvent := s.addActivityTaskFailedEvent(6, common.BufferedEventID, activity2Failure, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, identity)
+	s.validateActivityTaskFailedEvent(activity2FailedEvent, common.BufferedEventID, 6, common.BufferedEventID, activity2Failure, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, identity)
 	s.Equal(int64(11), s.getNextEventID())
 	_, activity2Running2 := s.msBuilder.GetActivityInfo(6)
 	s.False(activity2Running2)
@@ -870,8 +870,8 @@ func (s *historyBuilderSuite) addActivityTaskCompletedEvent(scheduleID, startedI
 	return event
 }
 
-func (s *historyBuilderSuite) addActivityTaskFailedEvent(scheduleID, startedID int64, failure *failurepb.Failure, retryStatus enumspb.RetryStatus, identity string) *historypb.HistoryEvent {
-	event, err := s.msBuilder.AddActivityTaskFailedEvent(scheduleID, startedID, failure, retryStatus, identity)
+func (s *historyBuilderSuite) addActivityTaskFailedEvent(scheduleID, startedID int64, failure *failurepb.Failure, retryState enumspb.RetryState, identity string) *historypb.HistoryEvent {
+	event, err := s.msBuilder.AddActivityTaskFailedEvent(scheduleID, startedID, failure, retryState, identity)
 	s.Nil(err)
 	return event
 }
@@ -1031,7 +1031,7 @@ func (s *historyBuilderSuite) validateActivityTaskCompletedEvent(event *historyp
 }
 
 func (s *historyBuilderSuite) validateActivityTaskFailedEvent(event *historypb.HistoryEvent, eventID,
-	scheduleID, startedID int64, failure *failurepb.Failure, retryStatus enumspb.RetryStatus, identity string) {
+	scheduleID, startedID int64, failure *failurepb.Failure, retryState enumspb.RetryState, identity string) {
 	s.NotNil(event)
 	s.Equal(enumspb.EVENT_TYPE_ACTIVITY_TASK_FAILED, event.EventType)
 	s.Equal(eventID, event.EventId)
@@ -1040,7 +1040,7 @@ func (s *historyBuilderSuite) validateActivityTaskFailedEvent(event *historypb.H
 	s.Equal(scheduleID, attributes.ScheduledEventId)
 	s.Equal(startedID, attributes.StartedEventId)
 	s.Equal(failure, attributes.Failure)
-	s.Equal(retryStatus, attributes.RetryStatus)
+	s.Equal(retryState, attributes.RetryState)
 	s.Equal(identity, attributes.Identity)
 }
 
diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
index 3c8e0270774..bcc6c3f9ea0 100644
--- a/service/history/historyEngine.go
+++ b/service/history/historyEngine.go
@@ -116,7 +116,7 @@ type (
 		GetDLQReplicationMessages(ctx context.Context, taskInfos []*replicationspb.ReplicationTaskInfo) ([]*replicationspb.ReplicationTask, error)
 		QueryWorkflow(ctx context.Context, request *historyservice.QueryWorkflowRequest) (*historyservice.QueryWorkflowResponse, error)
 		ReapplyEvents(ctx context.Context, namespaceUUID string, workflowID string, runID string, events []*historypb.HistoryEvent) error
-		ReadDLQMessages(ctx context.Context, messagesRequest *historyservice.ReadDLQMessagesRequest) (*historyservice.ReadDLQMessagesResponse, error)
+		GetDLQMessages(ctx context.Context, messagesRequest *historyservice.GetDLQMessagesRequest) (*historyservice.GetDLQMessagesResponse, error)
 		PurgeDLQMessages(ctx context.Context, messagesRequest *historyservice.PurgeDLQMessagesRequest) error
 		MergeDLQMessages(ctx context.Context, messagesRequest *historyservice.MergeDLQMessagesRequest) (*historyservice.MergeDLQMessagesResponse, error)
 		RefreshWorkflowTasks(ctx context.Context, namespaceUUID string, execution commonpb.WorkflowExecution) error
@@ -1581,13 +1581,13 @@ func (e *historyEngineImpl) RespondActivityTaskFailed(
 
 			postActions := &updateWorkflowAction{}
 			failure := request.GetFailure()
-			retryStatus, err := mutableState.RetryActivity(ai, failure)
+			retryState, err := mutableState.RetryActivity(ai, failure)
 			if err != nil {
 				return nil, err
 			}
-			if retryStatus != enumspb.RETRY_STATUS_IN_PROGRESS {
+			if retryState != enumspb.RETRY_STATE_IN_PROGRESS {
 				// no more retry, and we want to record the failure event
-				if _, err := mutableState.AddActivityTaskFailedEvent(scheduleID, ai.StartedID, failure, retryStatus, request.GetIdentity()); err != nil {
+				if _, err := mutableState.AddActivityTaskFailedEvent(scheduleID, ai.StartedID, failure, retryState, request.GetIdentity()); err != nil {
 					// Unable to add ActivityTaskFailed event to history
 					return nil, serviceerror.NewInternal("Unable to add ActivityTaskFailed event to history.")
 				}
@@ -3050,12 +3050,12 @@ func (e *historyEngineImpl) ReapplyEvents(
 		})
 }
 
-func (e *historyEngineImpl) ReadDLQMessages(
+func (e *historyEngineImpl) GetDLQMessages(
 	ctx context.Context,
-	request *historyservice.ReadDLQMessagesRequest,
-) (*historyservice.ReadDLQMessagesResponse, error) {
+	request *historyservice.GetDLQMessagesRequest,
+) (*historyservice.GetDLQMessagesResponse, error) {
 
-	tasks, token, err := e.replicationDLQHandler.readMessages(
+	tasks, token, err := e.replicationDLQHandler.getMessages(
 		ctx,
 		request.GetSourceCluster(),
 		request.GetInclusiveEndMessageId(),
@@ -3065,7 +3065,7 @@ func (e *historyEngineImpl) ReadDLQMessages(
 	if err != nil {
 		return nil, err
 	}
-	return &historyservice.ReadDLQMessagesResponse{
+	return &historyservice.GetDLQMessagesResponse{
 		Type:             request.GetType(),
 		ReplicationTasks: tasks,
 		NextPageToken:    token,
diff --git a/service/history/historyEngineInterfaces.go b/service/history/historyEngineInterfaces.go
index bcaada2074b..91227a35aa3 100644
--- a/service/history/historyEngineInterfaces.go
+++ b/service/history/historyEngineInterfaces.go
@@ -76,7 +76,7 @@ type (
 		GetVersion() int64
 		GetTaskId() int64
 		GetTaskType() enumsspb.TaskType
-		GetVisibilityTimestamp() *types.Timestamp
+		GetVisibilityTime() *types.Timestamp
 		GetWorkflowId() string
 		GetRunId() string
 		GetNamespaceId() string
diff --git a/service/history/historyEngineInterfaces_mock.go b/service/history/historyEngineInterfaces_mock.go
index e1708affe8d..a1f6701deef 100644
--- a/service/history/historyEngineInterfaces_mock.go
+++ b/service/history/historyEngineInterfaces_mock.go
@@ -104,18 +104,18 @@ func (mr *MockqueueTaskInfoMockRecorder) GetTaskType() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTaskType", reflect.TypeOf((*MockqueueTaskInfo)(nil).GetTaskType))
 }
 
-// GetVisibilityTimestamp mocks base method
-func (m *MockqueueTaskInfo) GetVisibilityTimestamp() *types.Timestamp {
+// GetVisibilityTime mocks base method
+func (m *MockqueueTaskInfo) GetVisibilityTime() *types.Timestamp {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetVisibilityTimestamp")
+	ret := m.ctrl.Call(m, "GetVisibilityTime")
 	ret0, _ := ret[0].(*types.Timestamp)
 	return ret0
 }
 
-// GetVisibilityTimestamp indicates an expected call of GetVisibilityTimestamp
+// GetVisibilityTime indicates an expected call of GetVisibilityTime
 func (mr *MockqueueTaskInfoMockRecorder) GetVisibilityTimestamp() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVisibilityTimestamp", reflect.TypeOf((*MockqueueTaskInfo)(nil).GetVisibilityTimestamp))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVisibilityTime", reflect.TypeOf((*MockqueueTaskInfo)(nil).GetVisibilityTime))
 }
 
 // GetWorkflowId mocks base method
@@ -331,18 +331,18 @@ func (mr *MockqueueTaskMockRecorder) GetTaskType() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTaskType", reflect.TypeOf((*MockqueueTask)(nil).GetTaskType))
 }
 
-// GetVisibilityTimestamp mocks base method
-func (m *MockqueueTask) GetVisibilityTimestamp() *types.Timestamp {
+// GetVisibilityTime mocks base method
+func (m *MockqueueTask) GetVisibilityTime() *types.Timestamp {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetVisibilityTimestamp")
+	ret := m.ctrl.Call(m, "GetVisibilityTime")
 	ret0, _ := ret[0].(*types.Timestamp)
 	return ret0
 }
 
-// GetVisibilityTimestamp indicates an expected call of GetVisibilityTimestamp
+// GetVisibilityTime indicates an expected call of GetVisibilityTime
 func (mr *MockqueueTaskMockRecorder) GetVisibilityTimestamp() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVisibilityTimestamp", reflect.TypeOf((*MockqueueTask)(nil).GetVisibilityTimestamp))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVisibilityTime", reflect.TypeOf((*MockqueueTask)(nil).GetVisibilityTime))
 }
 
 // GetWorkflowId mocks base method
diff --git a/service/history/historyEngine_mock.go b/service/history/historyEngine_mock.go
index e30f31c1f9e..8f62a0ac4b8 100644
--- a/service/history/historyEngine_mock.go
+++ b/service/history/historyEngine_mock.go
@@ -536,19 +536,19 @@ func (mr *MockEngineMockRecorder) ReapplyEvents(ctx, namespaceUUID, workflowID,
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReapplyEvents", reflect.TypeOf((*MockEngine)(nil).ReapplyEvents), ctx, namespaceUUID, workflowID, runID, events)
 }
 
-// ReadDLQMessages mocks base method.
-func (m *MockEngine) ReadDLQMessages(ctx context.Context, messagesRequest *historyservice.ReadDLQMessagesRequest) (*historyservice.ReadDLQMessagesResponse, error) {
+// GetDLQMessages mocks base method.
+func (m *MockEngine) GetDLQMessages(ctx context.Context, messagesRequest *historyservice.GetDLQMessagesRequest) (*historyservice.GetDLQMessagesResponse, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ReadDLQMessages", ctx, messagesRequest)
-	ret0, _ := ret[0].(*historyservice.ReadDLQMessagesResponse)
+	ret := m.ctrl.Call(m, "GetDLQMessages", ctx, messagesRequest)
+	ret0, _ := ret[0].(*historyservice.GetDLQMessagesResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ReadDLQMessages indicates an expected call of ReadDLQMessages.
-func (mr *MockEngineMockRecorder) ReadDLQMessages(ctx, messagesRequest interface{}) *gomock.Call {
+// GetDLQMessages indicates an expected call of GetDLQMessages.
+func (mr *MockEngineMockRecorder) GetDLQMessages(ctx, messagesRequest interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadDLQMessages", reflect.TypeOf((*MockEngine)(nil).ReadDLQMessages), ctx, messagesRequest)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDLQMessages", reflect.TypeOf((*MockEngine)(nil).GetDLQMessages), ctx, messagesRequest)
 }
 
 // PurgeDLQMessages mocks base method.
diff --git a/service/history/historyEngine_test.go b/service/history/historyEngine_test.go
index 83b7ff2ec6c..f8308fcb08d 100644
--- a/service/history/historyEngine_test.go
+++ b/service/history/historyEngine_test.go
@@ -128,9 +128,9 @@ var testLocalNamespaceEntry = cache.NewLocalNamespaceCacheEntryForTest(
 var testGlobalNamespaceEntry = cache.NewGlobalNamespaceCacheEntryForTest(
 	&persistenceblobs.NamespaceInfo{Id: testNamespaceID, Name: testNamespace},
 	&persistenceblobs.NamespaceConfig{
-		RetentionDays:            1,
-		VisibilityArchivalStatus: enumspb.ARCHIVAL_STATUS_ENABLED,
-		VisibilityArchivalUri:    "test:///visibility/archival",
+		RetentionDays:           1,
+		VisibilityArchivalState: enumspb.ARCHIVAL_STATE_ENABLED,
+		VisibilityArchivalUri:   "test:///visibility/archival",
 	},
 	&persistenceblobs.NamespaceReplicationConfig{
 		ActiveClusterName: cluster.TestCurrentClusterName,
@@ -559,7 +559,7 @@ func (s *engineSuite) TestQueryWorkflow_RejectBasedOnFailed() {
 	event := addDecisionTaskStartedEvent(msBuilder, di.ScheduleID, taskqueue, identity)
 	di.StartedID = event.GetEventId()
 	event = addDecisionTaskCompletedEvent(msBuilder, di.ScheduleID, di.StartedID, "some random identity")
-	addFailWorkflowEvent(msBuilder, event.GetEventId(), failure.NewServerFailure("failure reason", true), enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE)
+	addFailWorkflowEvent(msBuilder, event.GetEventId(), failure.NewServerFailure("failure reason", true), enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE)
 	ms := createMutableState(msBuilder)
 	gweResponse := &persistence.GetWorkflowExecutionResponse{State: ms}
 	s.mockExecutionMgr.On("GetWorkflowExecution", mock.Anything).Return(gweResponse, nil).Once()
@@ -2995,7 +2995,7 @@ func (s *engineSuite) TestRespondActivityTaskFailedIfTaskCompleted() {
 	activityScheduledEvent, _ := addActivityTaskScheduledEvent(msBuilder, decisionCompletedEvent.EventId, activityID,
 		activityType, tl, activityInput, 100, 10, 1, 5)
 	activityStartedEvent := addActivityTaskStartedEvent(msBuilder, activityScheduledEvent.EventId, identity)
-	addActivityTaskFailedEvent(msBuilder, activityScheduledEvent.EventId, activityStartedEvent.EventId, failure, enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE, identity)
+	addActivityTaskFailedEvent(msBuilder, activityScheduledEvent.EventId, activityStartedEvent.EventId, failure, enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE, identity)
 	addDecisionTaskScheduledEvent(msBuilder)
 
 	ms := createMutableState(msBuilder)
@@ -4993,8 +4993,8 @@ func addActivityTaskCompletedEvent(builder mutableState, scheduleID, startedID i
 	return event
 }
 
-func addActivityTaskFailedEvent(builder mutableState, scheduleID, startedID int64, failure *failurepb.Failure, retryStatus enumspb.RetryStatus, identity string) *historypb.HistoryEvent {
-	event, _ := builder.AddActivityTaskFailedEvent(scheduleID, startedID, failure, retryStatus, identity)
+func addActivityTaskFailedEvent(builder mutableState, scheduleID, startedID int64, failure *failurepb.Failure, retryState enumspb.RetryState, identity string) *historypb.HistoryEvent {
+	event, _ := builder.AddActivityTaskFailedEvent(scheduleID, startedID, failure, retryState, identity)
 	return event
 }
 
@@ -5105,11 +5105,11 @@ func addFailWorkflowEvent(
 	builder mutableState,
 	decisionCompletedEventID int64,
 	failure *failurepb.Failure,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) *historypb.HistoryEvent {
 	event, _ := builder.AddFailWorkflowEvent(
 		decisionCompletedEventID,
-		retryStatus,
+		retryState,
 		&decisionpb.FailWorkflowExecutionDecisionAttributes{
 			Failure: failure,
 		},
diff --git a/service/history/mutableState.go b/service/history/mutableState.go
index 343dddc9af5..ec92a5ea91b 100644
--- a/service/history/mutableState.go
+++ b/service/history/mutableState.go
@@ -70,10 +70,10 @@ type (
 		AddActivityTaskCancelRequestedEvent(int64, int64, string) (*historypb.HistoryEvent, *persistence.ActivityInfo, error)
 		AddActivityTaskCanceledEvent(int64, int64, int64, *commonpb.Payloads, string) (*historypb.HistoryEvent, error)
 		AddActivityTaskCompletedEvent(int64, int64, *workflowservice.RespondActivityTaskCompletedRequest) (*historypb.HistoryEvent, error)
-		AddActivityTaskFailedEvent(int64, int64, *failurepb.Failure, enumspb.RetryStatus, string) (*historypb.HistoryEvent, error)
+		AddActivityTaskFailedEvent(int64, int64, *failurepb.Failure, enumspb.RetryState, string) (*historypb.HistoryEvent, error)
 		AddActivityTaskScheduledEvent(int64, *decisionpb.ScheduleActivityTaskDecisionAttributes) (*historypb.HistoryEvent, *persistence.ActivityInfo, error)
 		AddActivityTaskStartedEvent(*persistence.ActivityInfo, int64, string, string) (*historypb.HistoryEvent, error)
-		AddActivityTaskTimedOutEvent(int64, int64, *failurepb.Failure, enumspb.RetryStatus) (*historypb.HistoryEvent, error)
+		AddActivityTaskTimedOutEvent(int64, int64, *failurepb.Failure, enumspb.RetryState) (*historypb.HistoryEvent, error)
 		AddCancelTimerFailedEvent(int64, *decisionpb.CancelTimerDecisionAttributes, string) (*historypb.HistoryEvent, error)
 		AddChildWorkflowExecutionCanceledEvent(int64, *commonpb.WorkflowExecution, *historypb.WorkflowExecutionCanceledEventAttributes) (*historypb.HistoryEvent, error)
 		AddChildWorkflowExecutionCompletedEvent(int64, *commonpb.WorkflowExecution, *historypb.WorkflowExecutionCompletedEventAttributes) (*historypb.HistoryEvent, error)
@@ -93,7 +93,7 @@ type (
 		AddDecisionTaskTimedOutEvent(int64, int64) (*historypb.HistoryEvent, error)
 		AddExternalWorkflowExecutionCancelRequested(int64, string, string, string) (*historypb.HistoryEvent, error)
 		AddExternalWorkflowExecutionSignaled(int64, string, string, string, string) (*historypb.HistoryEvent, error)
-		AddFailWorkflowEvent(int64, enumspb.RetryStatus, *decisionpb.FailWorkflowExecutionDecisionAttributes) (*historypb.HistoryEvent, error)
+		AddFailWorkflowEvent(int64, enumspb.RetryState, *decisionpb.FailWorkflowExecutionDecisionAttributes) (*historypb.HistoryEvent, error)
 		AddRecordMarkerEvent(int64, *decisionpb.RecordMarkerDecisionAttributes) (*historypb.HistoryEvent, error)
 		AddRequestCancelExternalWorkflowExecutionFailedEvent(int64, int64, string, string, string, enumspb.CancelExternalWorkflowExecutionFailedCause) (*historypb.HistoryEvent, error)
 		AddRequestCancelExternalWorkflowExecutionInitiatedEvent(int64, string, *decisionpb.RequestCancelExternalWorkflowExecutionDecisionAttributes) (*historypb.HistoryEvent, *persistenceblobs.RequestCancelInfo, error)
@@ -102,7 +102,7 @@ type (
 		AddSignalRequested(requestID string)
 		AddStartChildWorkflowExecutionFailedEvent(int64, enumspb.StartChildWorkflowExecutionFailedCause, *historypb.StartChildWorkflowExecutionInitiatedEventAttributes) (*historypb.HistoryEvent, error)
 		AddStartChildWorkflowExecutionInitiatedEvent(int64, string, *decisionpb.StartChildWorkflowExecutionDecisionAttributes) (*historypb.HistoryEvent, *persistence.ChildExecutionInfo, error)
-		AddTimeoutWorkflowEvent(int64, enumspb.RetryStatus) (*historypb.HistoryEvent, error)
+		AddTimeoutWorkflowEvent(int64, enumspb.RetryState) (*historypb.HistoryEvent, error)
 		AddTimerCanceledEvent(int64, *decisionpb.CancelTimerDecisionAttributes, string) (*historypb.HistoryEvent, error)
 		AddTimerFiredEvent(string) (*historypb.HistoryEvent, error)
 		AddTimerStartedEvent(int64, *decisionpb.StartTimerDecisionAttributes) (*historypb.HistoryEvent, *persistenceblobs.TimerInfo, error)
@@ -115,7 +115,7 @@ type (
 		ClearStickyness()
 		CheckResettable() error
 		CopyToPersistence() *persistence.WorkflowMutableState
-		RetryActivity(ai *persistence.ActivityInfo, failure *failurepb.Failure) (enumspb.RetryStatus, error)
+		RetryActivity(ai *persistence.ActivityInfo, failure *failurepb.Failure) (enumspb.RetryState, error)
 		CreateNewHistoryEvent(eventType enumspb.EventType) *historypb.HistoryEvent
 		CreateNewHistoryEventWithTimestamp(eventType enumspb.EventType, timestamp int64) *historypb.HistoryEvent
 		CreateTransientDecisionEvents(di *decisionInfo, identity string) (*historypb.HistoryEvent, *historypb.HistoryEvent)
@@ -150,7 +150,7 @@ type (
 		GetPendingSignalExternalInfos() map[int64]*persistenceblobs.SignalInfo
 		GetReplicationState() *persistence.ReplicationState
 		GetRequestCancelInfo(int64) (*persistenceblobs.RequestCancelInfo, bool)
-		GetRetryBackoffDuration(failure *failurepb.Failure) (time.Duration, enumspb.RetryStatus)
+		GetRetryBackoffDuration(failure *failurepb.Failure) (time.Duration, enumspb.RetryState)
 		GetCronBackoffDuration() (time.Duration, error)
 		GetSignalInfo(int64) (*persistenceblobs.SignalInfo, bool)
 		GetStartVersion() (int64, error)
diff --git a/service/history/mutableStateBuilder.go b/service/history/mutableStateBuilder.go
index 28b2b775eac..318535755a1 100644
--- a/service/history/mutableStateBuilder.go
+++ b/service/history/mutableStateBuilder.go
@@ -1098,11 +1098,11 @@ func (e *mutableStateBuilder) GetRequestCancelInfo(
 
 func (e *mutableStateBuilder) GetRetryBackoffDuration(
 	failure *failurepb.Failure,
-) (time.Duration, enumspb.RetryStatus) {
+) (time.Duration, enumspb.RetryState) {
 
 	info := e.executionInfo
 	if !info.HasRetryPolicy {
-		return backoff.NoBackoff, enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET
+		return backoff.NoBackoff, enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET
 	}
 
 	return getBackoffInterval(
@@ -2332,7 +2332,7 @@ func (e *mutableStateBuilder) AddActivityTaskFailedEvent(
 	scheduleEventID int64,
 	startedEventID int64,
 	failure *failurepb.Failure,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 	identity string,
 ) (*historypb.HistoryEvent, error) {
 
@@ -2354,7 +2354,7 @@ func (e *mutableStateBuilder) AddActivityTaskFailedEvent(
 	if err := e.addTransientActivityStartedEvent(scheduleEventID); err != nil {
 		return nil, err
 	}
-	event := e.hBuilder.AddActivityTaskFailedEvent(scheduleEventID, startedEventID, failure, retryStatus, identity)
+	event := e.hBuilder.AddActivityTaskFailedEvent(scheduleEventID, startedEventID, failure, retryState, identity)
 	if err := e.ReplicateActivityTaskFailedEvent(event); err != nil {
 		return nil, err
 	}
@@ -2376,7 +2376,7 @@ func (e *mutableStateBuilder) AddActivityTaskTimedOutEvent(
 	scheduleEventID int64,
 	startedEventID int64,
 	timeoutFailure *failurepb.Failure,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) (*historypb.HistoryEvent, error) {
 
 	opTag := tag.WorkflowActionActivityTaskTimedOut
@@ -2403,7 +2403,7 @@ func (e *mutableStateBuilder) AddActivityTaskTimedOutEvent(
 	if err := e.addTransientActivityStartedEvent(scheduleEventID); err != nil {
 		return nil, err
 	}
-	event := e.hBuilder.AddActivityTaskTimedOutEvent(scheduleEventID, startedEventID, timeoutFailure, retryStatus)
+	event := e.hBuilder.AddActivityTaskTimedOutEvent(scheduleEventID, startedEventID, timeoutFailure, retryState)
 	if err := e.ReplicateActivityTaskTimedOutEvent(event); err != nil {
 		return nil, err
 	}
@@ -2592,7 +2592,7 @@ func (e *mutableStateBuilder) ReplicateWorkflowExecutionCompletedEvent(
 
 func (e *mutableStateBuilder) AddFailWorkflowEvent(
 	decisionCompletedEventID int64,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 	attributes *decisionpb.FailWorkflowExecutionDecisionAttributes,
 ) (*historypb.HistoryEvent, error) {
 
@@ -2601,7 +2601,7 @@ func (e *mutableStateBuilder) AddFailWorkflowEvent(
 		return nil, err
 	}
 
-	event := e.hBuilder.AddFailWorkflowEvent(decisionCompletedEventID, retryStatus, attributes)
+	event := e.hBuilder.AddFailWorkflowEvent(decisionCompletedEventID, retryState, attributes)
 	if err := e.ReplicateWorkflowExecutionFailedEvent(decisionCompletedEventID, event); err != nil {
 		return nil, err
 	}
@@ -2633,7 +2633,7 @@ func (e *mutableStateBuilder) ReplicateWorkflowExecutionFailedEvent(
 
 func (e *mutableStateBuilder) AddTimeoutWorkflowEvent(
 	firstEventID int64,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) (*historypb.HistoryEvent, error) {
 
 	opTag := tag.WorkflowActionWorkflowTimeout
@@ -2641,7 +2641,7 @@ func (e *mutableStateBuilder) AddTimeoutWorkflowEvent(
 		return nil, err
 	}
 
-	event := e.hBuilder.AddTimeoutWorkflowEvent(retryStatus)
+	event := e.hBuilder.AddTimeoutWorkflowEvent(retryState)
 	if err := e.ReplicateWorkflowExecutionTimedoutEvent(firstEventID, event); err != nil {
 		return nil, err
 	}
@@ -3784,24 +3784,24 @@ func (e *mutableStateBuilder) ReplicateChildWorkflowExecutionTimedOutEvent(
 func (e *mutableStateBuilder) RetryActivity(
 	ai *persistence.ActivityInfo,
 	failure *failurepb.Failure,
-) (enumspb.RetryStatus, error) {
+) (enumspb.RetryState, error) {
 
 	opTag := tag.WorkflowActionActivityTaskRetry
 	if err := e.checkMutability(opTag); err != nil {
-		return enumspb.RETRY_STATUS_INTERNAL_SERVER_ERROR, err
+		return enumspb.RETRY_STATE_INTERNAL_SERVER_ERROR, err
 	}
 
 	if !ai.HasRetryPolicy {
-		return enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET, nil
+		return enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET, nil
 	}
 
 	if ai.CancelRequested {
-		return enumspb.RETRY_STATUS_CANCEL_REQUESTED, nil
+		return enumspb.RETRY_STATE_CANCEL_REQUESTED, nil
 	}
 
 	now := e.timeSource.Now()
 
-	backoffInterval, retryStatus := getBackoffInterval(
+	backoffInterval, retryState := getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -3812,8 +3812,8 @@ func (e *mutableStateBuilder) RetryActivity(
 		failure,
 		ai.NonRetryableErrorTypes,
 	)
-	if retryStatus != enumspb.RETRY_STATUS_IN_PROGRESS {
-		return retryStatus, nil
+	if retryState != enumspb.RETRY_STATE_IN_PROGRESS {
+		return retryState, nil
 	}
 
 	// a retry is needed, update activity info for next retry
@@ -3830,12 +3830,12 @@ func (e *mutableStateBuilder) RetryActivity(
 	if err := e.taskGenerator.generateActivityRetryTasks(
 		ai.ScheduleID,
 	); err != nil {
-		return enumspb.RETRY_STATUS_INTERNAL_SERVER_ERROR, err
+		return enumspb.RETRY_STATE_INTERNAL_SERVER_ERROR, err
 	}
 
 	e.updateActivityInfos[ai] = struct{}{}
 	e.syncActivityTasks[ai.ScheduleID] = struct{}{}
-	return enumspb.RETRY_STATUS_IN_PROGRESS, nil
+	return enumspb.RETRY_STATE_IN_PROGRESS, nil
 }
 
 // TODO mutable state should generate corresponding transfer / timer tasks according to
diff --git a/service/history/mutableState_mock.go b/service/history/mutableState_mock.go
index 0ac53dd1b96..a40c1f7ad90 100644
--- a/service/history/mutableState_mock.go
+++ b/service/history/mutableState_mock.go
@@ -35,11 +35,11 @@ import (
 	gomock "github.com/golang/mock/gomock"
 	common "go.temporal.io/api/common/v1"
 	decision "go.temporal.io/api/decision/v1"
-	enums0 "go.temporal.io/api/enums/v1"
+	enums "go.temporal.io/api/enums/v1"
 	failure "go.temporal.io/api/failure/v1"
 	history "go.temporal.io/api/history/v1"
 	workflowservice "go.temporal.io/api/workflowservice/v1"
-	enums "go.temporal.io/server/api/enums/v1"
+	enums0 "go.temporal.io/server/api/enums/v1"
 	historyservice "go.temporal.io/server/api/historyservice/v1"
 	persistenceblobs "go.temporal.io/server/api/persistenceblobs/v1"
 	cache "go.temporal.io/server/common/cache"
@@ -117,7 +117,7 @@ func (mr *MockmutableStateMockRecorder) AddActivityTaskCompletedEvent(arg0, arg1
 }
 
 // AddActivityTaskFailedEvent mocks base method.
-func (m *MockmutableState) AddActivityTaskFailedEvent(arg0, arg1 int64, arg2 *failure.Failure, arg3 enums0.RetryStatus, arg4 string) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddActivityTaskFailedEvent(arg0, arg1 int64, arg2 *failure.Failure, arg3 enums.RetryState, arg4 string) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddActivityTaskFailedEvent", arg0, arg1, arg2, arg3, arg4)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -163,7 +163,7 @@ func (mr *MockmutableStateMockRecorder) AddActivityTaskStartedEvent(arg0, arg1,
 }
 
 // AddActivityTaskTimedOutEvent mocks base method.
-func (m *MockmutableState) AddActivityTaskTimedOutEvent(arg0, arg1 int64, arg2 *failure.Failure, arg3 enums0.RetryStatus) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddActivityTaskTimedOutEvent(arg0, arg1 int64, arg2 *failure.Failure, arg3 enums.RetryState) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddActivityTaskTimedOutEvent", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -329,7 +329,7 @@ func (mr *MockmutableStateMockRecorder) AddDecisionTaskCompletedEvent(arg0, arg1
 }
 
 // AddDecisionTaskFailedEvent mocks base method.
-func (m *MockmutableState) AddDecisionTaskFailedEvent(scheduleEventID, startedEventID int64, cause enums0.DecisionTaskFailedCause, failure *failure.Failure, identity, binChecksum, baseRunID, newRunID string, forkEventVersion int64) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddDecisionTaskFailedEvent(scheduleEventID, startedEventID int64, cause enums.DecisionTaskFailedCause, failure *failure.Failure, identity, binChecksum, baseRunID, newRunID string, forkEventVersion int64) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddDecisionTaskFailedEvent", scheduleEventID, startedEventID, cause, failure, identity, binChecksum, baseRunID, newRunID, forkEventVersion)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -464,7 +464,7 @@ func (mr *MockmutableStateMockRecorder) AddExternalWorkflowExecutionSignaled(arg
 }
 
 // AddFailWorkflowEvent mocks base method.
-func (m *MockmutableState) AddFailWorkflowEvent(arg0 int64, arg1 enums0.RetryStatus, arg2 *decision.FailWorkflowExecutionDecisionAttributes) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddFailWorkflowEvent(arg0 int64, arg1 enums.RetryState, arg2 *decision.FailWorkflowExecutionDecisionAttributes) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddFailWorkflowEvent", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -494,7 +494,7 @@ func (mr *MockmutableStateMockRecorder) AddRecordMarkerEvent(arg0, arg1 interfac
 }
 
 // AddRequestCancelExternalWorkflowExecutionFailedEvent mocks base method.
-func (m *MockmutableState) AddRequestCancelExternalWorkflowExecutionFailedEvent(arg0, arg1 int64, arg2, arg3, arg4 string, arg5 enums0.CancelExternalWorkflowExecutionFailedCause) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddRequestCancelExternalWorkflowExecutionFailedEvent(arg0, arg1 int64, arg2, arg3, arg4 string, arg5 enums.CancelExternalWorkflowExecutionFailedCause) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddRequestCancelExternalWorkflowExecutionFailedEvent", arg0, arg1, arg2, arg3, arg4, arg5)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -525,7 +525,7 @@ func (mr *MockmutableStateMockRecorder) AddRequestCancelExternalWorkflowExecutio
 }
 
 // AddSignalExternalWorkflowExecutionFailedEvent mocks base method.
-func (m *MockmutableState) AddSignalExternalWorkflowExecutionFailedEvent(arg0, arg1 int64, arg2, arg3, arg4, arg5 string, arg6 enums0.SignalExternalWorkflowExecutionFailedCause) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddSignalExternalWorkflowExecutionFailedEvent(arg0, arg1 int64, arg2, arg3, arg4, arg5 string, arg6 enums.SignalExternalWorkflowExecutionFailedCause) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddSignalExternalWorkflowExecutionFailedEvent", arg0, arg1, arg2, arg3, arg4, arg5, arg6)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -568,7 +568,7 @@ func (mr *MockmutableStateMockRecorder) AddSignalRequested(requestID interface{}
 }
 
 // AddStartChildWorkflowExecutionFailedEvent mocks base method.
-func (m *MockmutableState) AddStartChildWorkflowExecutionFailedEvent(arg0 int64, arg1 enums0.StartChildWorkflowExecutionFailedCause, arg2 *history.StartChildWorkflowExecutionInitiatedEventAttributes) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddStartChildWorkflowExecutionFailedEvent(arg0 int64, arg1 enums.StartChildWorkflowExecutionFailedCause, arg2 *history.StartChildWorkflowExecutionInitiatedEventAttributes) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddStartChildWorkflowExecutionFailedEvent", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -599,7 +599,7 @@ func (mr *MockmutableStateMockRecorder) AddStartChildWorkflowExecutionInitiatedE
 }
 
 // AddTimeoutWorkflowEvent mocks base method.
-func (m *MockmutableState) AddTimeoutWorkflowEvent(arg0 int64, arg1 enums0.RetryStatus) (*history.HistoryEvent, error) {
+func (m *MockmutableState) AddTimeoutWorkflowEvent(arg0 int64, arg1 enums.RetryState) (*history.HistoryEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AddTimeoutWorkflowEvent", arg0, arg1)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -790,10 +790,10 @@ func (mr *MockmutableStateMockRecorder) CopyToPersistence() *gomock.Call {
 }
 
 // RetryActivity mocks base method.
-func (m *MockmutableState) RetryActivity(ai *persistence.ActivityInfo, failure *failure.Failure) (enums0.RetryStatus, error) {
+func (m *MockmutableState) RetryActivity(ai *persistence.ActivityInfo, failure *failure.Failure) (enums.RetryState, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RetryActivity", ai, failure)
-	ret0, _ := ret[0].(enums0.RetryStatus)
+	ret0, _ := ret[0].(enums.RetryState)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -805,7 +805,7 @@ func (mr *MockmutableStateMockRecorder) RetryActivity(ai, failure interface{}) *
 }
 
 // CreateNewHistoryEvent mocks base method.
-func (m *MockmutableState) CreateNewHistoryEvent(eventType enums0.EventType) *history.HistoryEvent {
+func (m *MockmutableState) CreateNewHistoryEvent(eventType enums.EventType) *history.HistoryEvent {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateNewHistoryEvent", eventType)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -819,7 +819,7 @@ func (mr *MockmutableStateMockRecorder) CreateNewHistoryEvent(eventType interfac
 }
 
 // CreateNewHistoryEventWithTimestamp mocks base method.
-func (m *MockmutableState) CreateNewHistoryEventWithTimestamp(eventType enums0.EventType, timestamp int64) *history.HistoryEvent {
+func (m *MockmutableState) CreateNewHistoryEventWithTimestamp(eventType enums.EventType, timestamp int64) *history.HistoryEvent {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateNewHistoryEventWithTimestamp", eventType, timestamp)
 	ret0, _ := ret[0].(*history.HistoryEvent)
@@ -1289,11 +1289,11 @@ func (mr *MockmutableStateMockRecorder) GetRequestCancelInfo(arg0 interface{}) *
 }
 
 // GetRetryBackoffDuration mocks base method.
-func (m *MockmutableState) GetRetryBackoffDuration(failure *failure.Failure) (time.Duration, enums0.RetryStatus) {
+func (m *MockmutableState) GetRetryBackoffDuration(failure *failure.Failure) (time.Duration, enums.RetryState) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetRetryBackoffDuration", failure)
 	ret0, _ := ret[0].(time.Duration)
-	ret1, _ := ret[1].(enums0.RetryStatus)
+	ret1, _ := ret[1].(enums.RetryState)
 	return ret0, ret1
 }
 
@@ -1393,11 +1393,11 @@ func (mr *MockmutableStateMockRecorder) GetWorkflowType() *gomock.Call {
 }
 
 // GetWorkflowStateStatus mocks base method.
-func (m *MockmutableState) GetWorkflowStateStatus() (enums.WorkflowExecutionState, enums0.WorkflowExecutionStatus) {
+func (m *MockmutableState) GetWorkflowStateStatus() (enums0.WorkflowExecutionState, enums.WorkflowExecutionStatus) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetWorkflowStateStatus")
-	ret0, _ := ret[0].(enums.WorkflowExecutionState)
-	ret1, _ := ret[1].(enums0.WorkflowExecutionStatus)
+	ret0, _ := ret[0].(enums0.WorkflowExecutionState)
+	ret1, _ := ret[1].(enums.WorkflowExecutionStatus)
 	return ret0, ret1
 }
 
@@ -1856,7 +1856,7 @@ func (mr *MockmutableStateMockRecorder) ReplicateDecisionTaskStartedEvent(arg0,
 }
 
 // ReplicateDecisionTaskTimedOutEvent mocks base method.
-func (m *MockmutableState) ReplicateDecisionTaskTimedOutEvent(arg0 enums0.TimeoutType) error {
+func (m *MockmutableState) ReplicateDecisionTaskTimedOutEvent(arg0 enums.TimeoutType) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ReplicateDecisionTaskTimedOutEvent", arg0)
 	ret0, _ := ret[0].(error)
@@ -2325,7 +2325,7 @@ func (mr *MockmutableStateMockRecorder) UpdateCurrentVersion(version, forceUpdat
 }
 
 // UpdateWorkflowStateStatus mocks base method.
-func (m *MockmutableState) UpdateWorkflowStateStatus(state enums.WorkflowExecutionState, status enums0.WorkflowExecutionStatus) error {
+func (m *MockmutableState) UpdateWorkflowStateStatus(state enums0.WorkflowExecutionState, status enums.WorkflowExecutionStatus) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateWorkflowStateStatus", state, status)
 	ret0, _ := ret[0].(error)
diff --git a/service/history/nDCStandbyTaskUtil.go b/service/history/nDCStandbyTaskUtil.go
index fd9d6d813e1..57ced00a651 100644
--- a/service/history/nDCStandbyTaskUtil.go
+++ b/service/history/nDCStandbyTaskUtil.go
@@ -76,7 +76,7 @@ func standbyTransferTaskPostActionTaskDiscarded(
 		tag.TaskID(transferTask.GetTaskId()),
 		tag.TaskType(transferTask.TaskType),
 		tag.FailoverVersion(transferTask.GetVersion()),
-		tag.TimestampProto(transferTask.VisibilityTimestamp),
+		tag.TimestampProto(transferTask.VisibilityTime),
 		tag.WorkflowEventID(transferTask.GetScheduleId()))
 	return ErrTaskDiscarded
 }
@@ -100,7 +100,7 @@ func standbyTimerTaskPostActionTaskDiscarded(
 		tag.TaskType(timerTask.TaskType),
 		tag.WorkflowTimeoutType(timerTask.TimeoutType),
 		tag.FailoverVersion(timerTask.GetVersion()),
-		tag.TimestampProto(timerTask.VisibilityTimestamp),
+		tag.TimestampProto(timerTask.VisibilityTime),
 		tag.WorkflowEventID(timerTask.GetEventId()))
 	return ErrTaskDiscarded
 }
@@ -198,7 +198,7 @@ func getStandbyPostActionFn(
 
 	// this is for task retry, use machine time
 	now := standbyNow()
-	taskTime, _ := types.TimestampFromProto(taskInfo.GetVisibilityTimestamp())
+	taskTime, _ := types.TimestampFromProto(taskInfo.GetVisibilityTime())
 	resendTime := taskTime.Add(standbyTaskMissingEventsResendDelay)
 	discardTime := taskTime.Add(standbyTaskMissingEventsDiscardDelay)
 
diff --git a/service/history/nDCTaskUtil.go b/service/history/nDCTaskUtil.go
index 74757ad90ca..687d34c2c51 100644
--- a/service/history/nDCTaskUtil.go
+++ b/service/history/nDCTaskUtil.go
@@ -166,12 +166,12 @@ func initializeLoggerForTask(
 	logger log.Logger,
 ) log.Logger {
 
-	t, _ := types.TimestampFromProto(task.GetVisibilityTimestamp())
+	t, _ := types.TimestampFromProto(task.GetVisibilityTime())
 	taskLogger := logger.WithTags(
 		tag.ShardID(shardID),
 		tag.TaskID(task.GetTaskId()),
 		tag.TaskVisibilityTimestamp(t.UnixNano()),
-		tag.TaskVisibilityTimestamp(task.GetVisibilityTimestamp().GetSeconds()),
+		tag.TaskVisibilityTimestamp(task.GetVisibilityTime().GetSeconds()),
 		tag.FailoverVersion(task.GetVersion()),
 		tag.TaskType(task.GetTaskType()),
 		tag.WorkflowNamespaceID(task.GetNamespaceId()),
diff --git a/service/history/nilCheckHandler.go b/service/history/nilCheckHandler.go
index fd04d22a960..04182694cc8 100644
--- a/service/history/nilCheckHandler.go
+++ b/service/history/nilCheckHandler.go
@@ -325,10 +325,10 @@ func (h *NilCheckHandler) ReapplyEvents(ctx context.Context, request *historyser
 	return resp, err
 }
 
-func (h *NilCheckHandler) ReadDLQMessages(ctx context.Context, request *historyservice.ReadDLQMessagesRequest) (*historyservice.ReadDLQMessagesResponse, error) {
-	resp, err := h.parentHandler.ReadDLQMessages(ctx, request)
+func (h *NilCheckHandler) GetDLQMessages(ctx context.Context, request *historyservice.GetDLQMessagesRequest) (*historyservice.GetDLQMessagesResponse, error) {
+	resp, err := h.parentHandler.GetDLQMessages(ctx, request)
 	if resp == nil && err == nil {
-		resp = &historyservice.ReadDLQMessagesResponse{}
+		resp = &historyservice.GetDLQMessagesResponse{}
 	}
 	return resp, err
 }
diff --git a/service/history/queueTask.go b/service/history/queueTask.go
index 1b84d54ba5e..57e325e3701 100644
--- a/service/history/queueTask.go
+++ b/service/history/queueTask.go
@@ -296,7 +296,7 @@ func (t *queueTaskBase) Ack() {
 	if t.shouldProcessTask {
 		t.scope.RecordTimer(metrics.TaskAttemptTimer, time.Duration(t.attempt))
 		t.scope.RecordTimer(metrics.TaskLatency, time.Since(t.submitTime))
-		t.scope.RecordTimer(metrics.TaskQueueLatency, time.Since(*timestamp.TimestampFromProto(t.GetVisibilityTimestamp()).ToTime()))
+		t.scope.RecordTimer(metrics.TaskQueueLatency, time.Since(*timestamp.TimestampFromProto(t.GetVisibilityTime()).ToTime()))
 	}
 }
 
diff --git a/service/history/replicationDLQHandler.go b/service/history/replicationDLQHandler.go
index 3ca9f69261d..122f25cb604 100644
--- a/service/history/replicationDLQHandler.go
+++ b/service/history/replicationDLQHandler.go
@@ -39,7 +39,7 @@ import (
 type (
 	// replicationDLQHandler is the interface handles replication DLQ messages
 	replicationDLQHandler interface {
-		readMessages(
+		getMessages(
 			ctx context.Context,
 			sourceCluster string,
 			lastMessageID int64,
@@ -78,7 +78,7 @@ func newReplicationDLQHandler(
 	}
 }
 
-func (r *replicationDLQHandlerImpl) readMessages(
+func (r *replicationDLQHandlerImpl) getMessages(
 	ctx context.Context,
 	sourceCluster string,
 	lastMessageID int64,
diff --git a/service/history/replicationDLQHandler_mock.go b/service/history/replicationDLQHandler_mock.go
index 1ef8b452dd7..967cfe3cc0d 100644
--- a/service/history/replicationDLQHandler_mock.go
+++ b/service/history/replicationDLQHandler_mock.go
@@ -59,20 +59,20 @@ func (m *MockreplicationDLQHandler) EXPECT() *MockreplicationDLQHandlerMockRecor
 	return m.recorder
 }
 
-// readMessages mocks base method.
-func (m *MockreplicationDLQHandler) readMessages(ctx context.Context, sourceCluster string, lastMessageID int64, pageSize int, pageToken []byte) ([]*repication.ReplicationTask, []byte, error) {
+// getMessages mocks base method.
+func (m *MockreplicationDLQHandler) getMessages(ctx context.Context, sourceCluster string, lastMessageID int64, pageSize int, pageToken []byte) ([]*repication.ReplicationTask, []byte, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "readMessages", ctx, sourceCluster, lastMessageID, pageSize, pageToken)
+	ret := m.ctrl.Call(m, "getMessages", ctx, sourceCluster, lastMessageID, pageSize, pageToken)
 	ret0, _ := ret[0].([]*repication.ReplicationTask)
 	ret1, _ := ret[1].([]byte)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2
 }
 
-// readMessages indicates an expected call of readMessages.
-func (mr *MockreplicationDLQHandlerMockRecorder) readMessages(ctx, sourceCluster, lastMessageID, pageSize, pageToken interface{}) *gomock.Call {
+// getMessages indicates an expected call of getMessages.
+func (mr *MockreplicationDLQHandlerMockRecorder) getMessages(ctx, sourceCluster, lastMessageID, pageSize, pageToken interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "readMessages", reflect.TypeOf((*MockreplicationDLQHandler)(nil).readMessages), ctx, sourceCluster, lastMessageID, pageSize, pageToken)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "getMessages", reflect.TypeOf((*MockreplicationDLQHandler)(nil).getMessages), ctx, sourceCluster, lastMessageID, pageSize, pageToken)
 }
 
 // purgeMessages mocks base method.
diff --git a/service/history/replicationDLQHandler_test.go b/service/history/replicationDLQHandler_test.go
index e1b751e282e..943ebc6acc9 100644
--- a/service/history/replicationDLQHandler_test.go
+++ b/service/history/replicationDLQHandler_test.go
@@ -155,7 +155,7 @@ func (s *replicationDLQHandlerSuite) TestReadMessages_OK() {
 	s.adminClient.EXPECT().
 		GetDLQReplicationMessages(ctx, gomock.Any()).
 		Return(&adminservice.GetDLQReplicationMessagesResponse{}, nil)
-	tasks, token, err := s.replicationMessageHandler.readMessages(ctx, sourceCluster, lastMessageID, pageSize, pageToken)
+	tasks, token, err := s.replicationMessageHandler.getMessages(ctx, sourceCluster, lastMessageID, pageSize, pageToken)
 	s.NoError(err)
 	s.Nil(token)
 	s.Nil(tasks)
diff --git a/service/history/replicatorQueueProcessor.go b/service/history/replicatorQueueProcessor.go
index 5a0fe3871a2..71d4027fcc0 100644
--- a/service/history/replicatorQueueProcessor.go
+++ b/service/history/replicatorQueueProcessor.go
@@ -651,7 +651,7 @@ func (p *replicatorQueueProcessorImpl) generateSyncActivityTask(
 			if activityInfo.StartedID != common.EmptyEventID {
 				startedTime = activityInfo.StartedTime.UnixNano()
 			}
-			// LastHeartBeatUpdatedTime must be valid when getting the sync activity replication task
+			// LastHeartbeatUpdateTime must be valid when getting the sync activity replication task
 			heartbeatTime = activityInfo.LastHeartBeatUpdatedTime.UnixNano()
 
 			// Version history uses when replicate the sync activity task
diff --git a/service/history/retry.go b/service/history/retry.go
index a23f8a3c55e..cc411a4fe26 100644
--- a/service/history/retry.go
+++ b/service/history/retry.go
@@ -44,19 +44,19 @@ func getBackoffInterval(
 	backoffCoefficient float64,
 	failure *failurepb.Failure,
 	nonRetryableTypes []string,
-) (time.Duration, enumspb.RetryStatus) {
+) (time.Duration, enumspb.RetryState) {
 	if !isRetryable(failure, nonRetryableTypes) {
-		return backoff.NoBackoff, enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE
+		return backoff.NoBackoff, enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE
 	}
 
 	if maxAttempts == 0 && expirationTime.IsZero() {
-		return backoff.NoBackoff, enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET
+		return backoff.NoBackoff, enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET
 	}
 
 	if maxAttempts > 0 && currAttempt >= maxAttempts-1 {
 		// currAttempt starts from 0.
 		// MaximumAttempts is the total attempts, including initial (non-retry) attempt.
-		return backoff.NoBackoff, enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED
+		return backoff.NoBackoff, enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED
 	}
 
 	nextInterval := int64(float64(initInterval) * math.Pow(backoffCoefficient, float64(currAttempt)))
@@ -65,7 +65,7 @@ func getBackoffInterval(
 		if maxInterval > 0 {
 			nextInterval = int64(maxInterval)
 		} else {
-			return backoff.NoBackoff, enumspb.RETRY_STATUS_TIMEOUT
+			return backoff.NoBackoff, enumspb.RETRY_STATE_TIMEOUT
 		}
 	}
 
@@ -77,10 +77,10 @@ func getBackoffInterval(
 	backoffInterval := time.Duration(nextInterval) * time.Second
 	nextScheduleTime := now.Add(backoffInterval)
 	if !expirationTime.IsZero() && nextScheduleTime.After(expirationTime) {
-		return backoff.NoBackoff, enumspb.RETRY_STATUS_TIMEOUT
+		return backoff.NoBackoff, enumspb.RETRY_STATE_TIMEOUT
 	}
 
-	return backoffInterval, enumspb.RETRY_STATUS_IN_PROGRESS
+	return backoffInterval, enumspb.RETRY_STATE_IN_PROGRESS
 }
 
 func isRetryable(failure *failurepb.Failure, nonRetryableTypes []string) bool {
diff --git a/service/history/retry_test.go b/service/history/retry_test.go
index b5a0f3fbe76..1349c9e0a1b 100644
--- a/service/history/retry_test.go
+++ b/service/history/retry_test.go
@@ -158,7 +158,7 @@ func Test_NextRetry(t *testing.T) {
 		NonRetryableErrorTypes: []string{},
 		StartedIdentity:        identity,
 	}
-	interval, retryStatus := getBackoffInterval(
+	interval, retryState := getBackoffInterval(
 		clock.NewRealTimeSource().Now(),
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -170,12 +170,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET, retryState)
 
 	// no retry if cancel requested
 	ai.HasRetryPolicy = true
 	ai.CancelRequested = true
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		clock.NewRealTimeSource().Now(),
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -187,11 +187,11 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET, retryState)
 
 	// no retry if both MaximumAttempts and WorkflowExpirationTime are not set
 	ai.CancelRequested = false
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		clock.NewRealTimeSource().Now(),
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -203,12 +203,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_RETRY_POLICY_NOT_SET, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_RETRY_POLICY_NOT_SET, retryState)
 
 	// no retry if MaximumAttempts is 1 (for initial attempt)
 	ai.InitialInterval = 1
 	ai.MaximumAttempts = 1
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		clock.NewRealTimeSource().Now(),
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -220,12 +220,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, retryState)
 
 	// backoff retry, intervals: 1s, 2s, 4s, 8s.
 	ai.MaximumAttempts = 5
 	ai.BackoffCoefficient = 2
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -237,10 +237,10 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -252,10 +252,10 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*2, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -267,12 +267,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*4, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
 	// test non-retryable error
 	serverFailure = failure.NewServerFailure("some non-retryable server failure", true)
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -284,11 +284,11 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE, retryState)
 
 	serverFailure = failure.NewServerFailure("good-reason", false)
 
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -300,12 +300,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*8, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
 	// no retry as max attempt reached
 	a.Equal(ai.MaximumAttempts-1, ai.Attempt)
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -317,12 +317,12 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_MAXIMUM_ATTEMPTS_REACHED, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_MAXIMUM_ATTEMPTS_REACHED, retryState)
 
 	// increase max attempts, with max interval cap at 10s
 	ai.MaximumAttempts = 6
 	ai.MaximumInterval = 10
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -334,13 +334,13 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*10, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
 	// no retry because expiration time before next interval
 	ai.MaximumAttempts = 8
 	ai.ExpirationTime = now.Add(time.Second * 5)
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -352,11 +352,11 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(backoff.NoBackoff, interval)
-	a.Equal(enumspb.RETRY_STATUS_TIMEOUT, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_TIMEOUT, retryState)
 
 	// extend expiration, next interval should be 10s
 	ai.ExpirationTime = now.Add(time.Minute)
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -368,13 +368,13 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*10, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 
 	// with big max retry, math.Pow() could overflow, verify that it uses the MaxInterval
 	ai.Attempt = 64
 	ai.MaximumAttempts = 100
-	interval, retryStatus = getBackoffInterval(
+	interval, retryState = getBackoffInterval(
 		now,
 		ai.ExpirationTime,
 		ai.Attempt,
@@ -386,6 +386,6 @@ func Test_NextRetry(t *testing.T) {
 		ai.NonRetryableErrorTypes,
 	)
 	a.Equal(time.Second*10, interval)
-	a.Equal(enumspb.RETRY_STATUS_IN_PROGRESS, retryStatus)
+	a.Equal(enumspb.RETRY_STATE_IN_PROGRESS, retryState)
 	ai.Attempt++
 }
diff --git a/service/history/shardContext.go b/service/history/shardContext.go
index a3916fea9b8..365d0ce5f32 100644
--- a/service/history/shardContext.go
+++ b/service/history/shardContext.go
@@ -320,7 +320,7 @@ func (s *shardContextImpl) GetTimerAckLevel() time.Time {
 	s.RLock()
 	defer s.RUnlock()
 
-	goTime, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevel)
+	goTime, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevelTime)
 	return goTime
 }
 
@@ -333,7 +333,7 @@ func (s *shardContextImpl) UpdateTimerAckLevel(ackLevel time.Time) error {
 		return err
 	}
 
-	s.shardInfo.TimerAckLevel = pTime
+	s.shardInfo.TimerAckLevelTime = pTime
 	s.shardInfo.StolenSinceRenew = 0
 	return s.updateShardInfoLocked()
 }
@@ -351,7 +351,7 @@ func (s *shardContextImpl) GetTimerClusterAckLevel(cluster string) time.Time {
 	}
 	// otherwise, default to existing ack level, which belongs to local cluster
 	// this can happen if you add more cluster
-	goTime, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevel)
+	goTime, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevelTime)
 	return goTime
 }
 
@@ -1035,7 +1035,7 @@ func (s *shardContextImpl) emitShardInfoMetricsLogsLocked() {
 
 	replicationLag := s.transferMaxReadLevel - s.shardInfo.ReplicationAckLevel
 	transferLag := s.transferMaxReadLevel - s.shardInfo.TransferAckLevel
-	timerAckLevel, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevel)
+	timerAckLevel, _ := types.TimestampFromProto(s.shardInfo.TimerAckLevelTime)
 	timerLag := time.Since(timerAckLevel)
 
 	transferFailoverInProgress := len(s.shardInfo.TransferFailoverLevels)
@@ -1148,7 +1148,7 @@ func (s *shardContextImpl) allocateTimerIDsLocked(
 		task.SetTaskID(seqNum)
 		visibilityTs := task.GetVisibilityTimestamp()
 		s.logger.Debug("Assigning new timer",
-			tag.Timestamp(visibilityTs), tag.TaskID(task.GetTaskID()), tag.AckLevel(s.shardInfo.TimerAckLevel))
+			tag.Timestamp(visibilityTs), tag.TaskID(task.GetTaskID()), tag.AckLevel(s.shardInfo.TimerAckLevelTime))
 	}
 	return nil
 }
@@ -1242,7 +1242,7 @@ func acquireShard(
 			continue
 		}
 
-		currentReadTime, _ := types.TimestampFromProto(shardInfo.TimerAckLevel)
+		currentReadTime, _ := types.TimestampFromProto(shardInfo.TimerAckLevelTime)
 		if clusterName != shardItem.GetClusterMetadata().GetCurrentClusterName() {
 			if currentTime, ok := shardInfo.ClusterTimerAckLevel[clusterName]; ok {
 				currentReadTime, _ = types.TimestampFromProto(currentTime)
@@ -1315,12 +1315,12 @@ func copyShardInfo(shardInfo *persistence.ShardInfoWithFailover) *persistence.Sh
 			StolenSinceRenew:             shardInfo.StolenSinceRenew,
 			ReplicationAckLevel:          shardInfo.ReplicationAckLevel,
 			TransferAckLevel:             shardInfo.TransferAckLevel,
-			TimerAckLevel:                shardInfo.TimerAckLevel,
+			TimerAckLevelTime:            shardInfo.TimerAckLevelTime,
 			ClusterTransferAckLevel:      clusterTransferAckLevel,
 			ClusterTimerAckLevel:         clusterTimerAckLevel,
 			NamespaceNotificationVersion: shardInfo.NamespaceNotificationVersion,
 			ClusterReplicationLevel:      clusterReplicationLevel,
-			UpdatedAt:                    shardInfo.UpdatedAt,
+			UpdateTime:                   shardInfo.UpdateTime,
 		},
 		TransferFailoverLevels: transferFailoverLevels,
 		TimerFailoverLevels:    timerFailoverLevels,
diff --git a/service/history/shardController_test.go b/service/history/shardController_test.go
index 0d85a4e61d3..6cd12933541 100644
--- a/service/history/shardController_test.go
+++ b/service/history/shardController_test.go
@@ -128,7 +128,7 @@ func (s *shardControllerSuite) TestAcquireShardSuccess() {
 						RangeId:             5,
 						ReplicationAckLevel: replicationAck,
 						TransferAckLevel:    currentClusterTransferAck,
-						TimerAckLevel:       currentClusterTimerAck,
+						TimerAckLevelTime:   currentClusterTimerAck,
 						ClusterTransferAckLevel: map[string]int64{
 							cluster.TestCurrentClusterName:     currentClusterTransferAck,
 							cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -148,7 +148,7 @@ func (s *shardControllerSuite) TestAcquireShardSuccess() {
 					StolenSinceRenew:    1,
 					ReplicationAckLevel: replicationAck,
 					TransferAckLevel:    currentClusterTransferAck,
-					TimerAckLevel:       currentClusterTimerAck,
+					TimerAckLevelTime:   currentClusterTimerAck,
 					ClusterTransferAckLevel: map[string]int64{
 						cluster.TestCurrentClusterName:     currentClusterTransferAck,
 						cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -208,7 +208,7 @@ func (s *shardControllerSuite) TestAcquireShardsConcurrently() {
 						RangeId:             5,
 						ReplicationAckLevel: replicationAck,
 						TransferAckLevel:    currentClusterTransferAck,
-						TimerAckLevel:       currentClusterTimerAck,
+						TimerAckLevelTime:   currentClusterTimerAck,
 						ClusterTransferAckLevel: map[string]int64{
 							cluster.TestCurrentClusterName:     currentClusterTransferAck,
 							cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -228,7 +228,7 @@ func (s *shardControllerSuite) TestAcquireShardsConcurrently() {
 					StolenSinceRenew:    1,
 					ReplicationAckLevel: replicationAck,
 					TransferAckLevel:    currentClusterTransferAck,
-					TimerAckLevel:       currentClusterTimerAck,
+					TimerAckLevelTime:   currentClusterTimerAck,
 					ClusterTransferAckLevel: map[string]int64{
 						cluster.TestCurrentClusterName:     currentClusterTransferAck,
 						cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -295,7 +295,7 @@ func (s *shardControllerSuite) TestAcquireShardRenewSuccess() {
 					RangeId:             5,
 					ReplicationAckLevel: replicationAck,
 					TransferAckLevel:    currentClusterTransferAck,
-					TimerAckLevel:       currentClusterTimerAck,
+					TimerAckLevelTime:   currentClusterTimerAck,
 					ClusterTransferAckLevel: map[string]int64{
 						cluster.TestCurrentClusterName:     currentClusterTransferAck,
 						cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -315,7 +315,7 @@ func (s *shardControllerSuite) TestAcquireShardRenewSuccess() {
 				StolenSinceRenew:    1,
 				ReplicationAckLevel: replicationAck,
 				TransferAckLevel:    currentClusterTransferAck,
-				TimerAckLevel:       currentClusterTimerAck,
+				TimerAckLevelTime:   currentClusterTimerAck,
 				ClusterTransferAckLevel: map[string]int64{
 					cluster.TestCurrentClusterName:     currentClusterTransferAck,
 					cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -367,7 +367,7 @@ func (s *shardControllerSuite) TestAcquireShardRenewLookupFailed() {
 					RangeId:             5,
 					ReplicationAckLevel: replicationAck,
 					TransferAckLevel:    currentClusterTransferAck,
-					TimerAckLevel:       currentClusterTimerAck,
+					TimerAckLevelTime:   currentClusterTimerAck,
 					ClusterTransferAckLevel: map[string]int64{
 						cluster.TestCurrentClusterName:     currentClusterTransferAck,
 						cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -387,7 +387,7 @@ func (s *shardControllerSuite) TestAcquireShardRenewLookupFailed() {
 				StolenSinceRenew:    1,
 				ReplicationAckLevel: replicationAck,
 				TransferAckLevel:    currentClusterTransferAck,
-				TimerAckLevel:       currentClusterTimerAck,
+				TimerAckLevelTime:   currentClusterTimerAck,
 				ClusterTransferAckLevel: map[string]int64{
 					cluster.TestCurrentClusterName:     currentClusterTransferAck,
 					cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -574,7 +574,7 @@ func (s *shardControllerSuite) setupMocksForAcquireShard(shardID int, mockEngine
 				RangeId:             currentRangeID,
 				ReplicationAckLevel: replicationAck,
 				TransferAckLevel:    currentClusterTransferAck,
-				TimerAckLevel:       currentClusterTimerAck,
+				TimerAckLevelTime:   currentClusterTimerAck,
 				ClusterTransferAckLevel: map[string]int64{
 					cluster.TestCurrentClusterName:     currentClusterTransferAck,
 					cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
@@ -594,7 +594,7 @@ func (s *shardControllerSuite) setupMocksForAcquireShard(shardID int, mockEngine
 			StolenSinceRenew:    1,
 			ReplicationAckLevel: replicationAck,
 			TransferAckLevel:    currentClusterTransferAck,
-			TimerAckLevel:       currentClusterTimerAck,
+			TimerAckLevelTime:   currentClusterTimerAck,
 			ClusterTransferAckLevel: map[string]int64{
 				cluster.TestCurrentClusterName:     currentClusterTransferAck,
 				cluster.TestAlternativeClusterName: alternativeClusterTransferAck,
diff --git a/service/history/taskProcessor.go b/service/history/taskProcessor.go
index b89c3cdf9d6..76f9f4a13e6 100644
--- a/service/history/taskProcessor.go
+++ b/service/history/taskProcessor.go
@@ -329,7 +329,7 @@ func (t *taskProcessor) ackTaskOnce(
 
 	task.processor.complete(task)
 	if task.shouldProcessTask {
-		goVisibilityTime, _ := types.TimestampFromProto(task.task.GetVisibilityTimestamp())
+		goVisibilityTime, _ := types.TimestampFromProto(task.task.GetVisibilityTime())
 		scope.RecordTimer(metrics.TaskAttemptTimer, time.Duration(task.attempt))
 		scope.RecordTimer(metrics.TaskLatency, time.Since(task.startTime))
 		scope.RecordTimer(metrics.TaskQueueLatency, time.Since(goVisibilityTime))
diff --git a/service/history/taskProcessor_test.go b/service/history/taskProcessor_test.go
index 2b01e8cb7f3..bbee5108105 100644
--- a/service/history/taskProcessor_test.go
+++ b/service/history/taskProcessor_test.go
@@ -127,7 +127,7 @@ func (s *taskProcessorSuite) TestProcessTaskAndAck_ShutDown() {
 }
 
 func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceErrRetry_ProcessNoErr() {
-	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTimestamp: types.TimestampNow()}, s.logger)
+	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTime: types.TimestampNow()}, s.logger)
 	var taskFilterErr taskFilter = func(task queueTaskInfo) (bool, error) {
 		return false, errors.New("some random error")
 	}
@@ -146,7 +146,7 @@ func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceErrRetry_ProcessNoEr
 }
 
 func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceFalse_ProcessNoErr() {
-	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTimestamp: types.TimestampNow()}, s.logger)
+	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTime: types.TimestampNow()}, s.logger)
 	task.shouldProcessTask = false
 	var taskFilter taskFilter = func(task queueTaskInfo) (bool, error) {
 		return false, nil
@@ -162,7 +162,7 @@ func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceFalse_ProcessNoErr()
 }
 
 func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceTrue_ProcessNoErr() {
-	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTimestamp: types.TimestampNow()}, s.logger)
+	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTime: types.TimestampNow()}, s.logger)
 	var taskFilter taskFilter = func(task queueTaskInfo) (bool, error) {
 		return true, nil
 	}
@@ -178,7 +178,7 @@ func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceTrue_ProcessNoErr()
 
 func (s *taskProcessorSuite) TestProcessTaskAndAck_NamespaceTrue_ProcessErrNoErr() {
 	err := errors.New("some random err")
-	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTimestamp: types.TimestampNow()}, s.logger)
+	task := newTaskInfo(s.mockProcessor, &persistenceblobs.TimerTaskInfo{TaskId: 12345, VisibilityTime: types.TimestampNow()}, s.logger)
 	var taskFilter taskFilter = func(task queueTaskInfo) (bool, error) {
 		return true, nil
 	}
diff --git a/service/history/timerQueueAckMgr.go b/service/history/timerQueueAckMgr.go
index 43183acff18..521eaaa29f4 100644
--- a/service/history/timerQueueAckMgr.go
+++ b/service/history/timerQueueAckMgr.go
@@ -245,7 +245,7 @@ func (t *timerQueueAckMgrImpl) readTimerTasks() ([]*persistenceblobs.TimerTaskIn
 
 TaskFilterLoop:
 	for _, task := range tasks {
-		timerKey := timerKeyFromGogoTime(task.GetVisibilityTimestamp(), task.GetTaskId())
+		timerKey := timerKeyFromGogoTime(task.GetVisibilityTime(), task.GetTaskId())
 		_, isLoaded := t.outstandingTasks[*timerKey]
 		if isLoaded {
 			// timer already loaded
@@ -314,7 +314,7 @@ func (t *timerQueueAckMgrImpl) readLookAheadTask() (*persistenceblobs.TimerTaskI
 }
 
 func (t *timerQueueAckMgrImpl) completeTimerTask(timerTask *persistenceblobs.TimerTaskInfo) {
-	timerKey := timerKeyFromGogoTime(timerTask.GetVisibilityTimestamp(), timerTask.GetTaskId())
+	timerKey := timerKeyFromGogoTime(timerTask.GetVisibilityTime(), timerTask.GetTaskId())
 	t.Lock()
 	defer t.Unlock()
 
diff --git a/service/history/timerQueueAckMgr_test.go b/service/history/timerQueueAckMgr_test.go
index e5490cce556..d840b9d94b2 100644
--- a/service/history/timerQueueAckMgr_test.go
+++ b/service/history/timerQueueAckMgr_test.go
@@ -188,15 +188,15 @@ func (s *timerQueueAckMgrSuite) TestGetTimerTasks_More() {
 	response := &persistence.GetTimerIndexTasksResponse{
 		Timers: []*persistenceblobs.TimerTaskInfo{
 			{
-				NamespaceId:         TestNamespaceId,
-				WorkflowId:          "some random workflow ID",
-				RunId:               uuid.New(),
-				VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-				TaskId:              int64(59),
-				TaskType:            1,
-				TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-				EventId:             int64(28),
-				ScheduleAttempt:     0,
+				NamespaceId:     TestNamespaceId,
+				WorkflowId:      "some random workflow ID",
+				RunId:           uuid.New(),
+				VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+				TaskId:          int64(59),
+				TaskType:        1,
+				TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+				EventId:         int64(28),
+				ScheduleAttempt: 0,
 			},
 		},
 		NextPageToken: []byte("some random output next page token"),
@@ -225,15 +225,15 @@ func (s *timerQueueAckMgrSuite) TestGetTimerTasks_NoMore() {
 	response := &persistence.GetTimerIndexTasksResponse{
 		Timers: []*persistenceblobs.TimerTaskInfo{
 			{
-				NamespaceId:         TestNamespaceId,
-				WorkflowId:          "some random workflow ID",
-				RunId:               uuid.New(),
-				VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-				TaskId:              int64(59),
-				TaskType:            1,
-				TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-				EventId:             int64(28),
-				ScheduleAttempt:     0,
+				NamespaceId:     TestNamespaceId,
+				WorkflowId:      "some random workflow ID",
+				RunId:           uuid.New(),
+				VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+				TaskId:          int64(59),
+				TaskType:        1,
+				TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+				EventId:         int64(28),
+				ScheduleAttempt: 0,
 			},
 		},
 		NextPageToken: nil,
@@ -260,15 +260,15 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_NoLookAhead_NoNextPage() {
 	s.Equal(minQueryLevel, maxQueryLevel)
 
 	timer := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 	response := &persistence.GetTimerIndexTasksResponse{
 		Timers:        []*persistenceblobs.TimerTaskInfo{timer},
@@ -283,7 +283,7 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_NoLookAhead_NoNextPage() {
 	s.Nil(lookAheadTask)
 	s.False(moreTasks)
 
-	timerSequenceID := timerKeyFromGogoTime(timer.VisibilityTimestamp, timer.GetTaskId())
+	timerSequenceID := timerKeyFromGogoTime(timer.VisibilityTime, timer.GetTaskId())
 	s.Equal(map[timerKey]bool{*timerSequenceID: false}, s.timerQueueAckMgr.outstandingTasks)
 	s.Equal(ackLevel, s.timerQueueAckMgr.ackLevel)
 	s.Empty(s.timerQueueAckMgr.pageToken)
@@ -303,16 +303,16 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_NoLookAhead_HasNextPage() {
 	s.Equal(minQueryLevel, maxQueryLevel)
 
 	timer := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
-		Version:             int64(79),
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
+		Version:         int64(79),
 	}
 
 	response := &persistence.GetTimerIndexTasksResponse{
@@ -327,7 +327,7 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_NoLookAhead_HasNextPage() {
 	s.Equal([]*persistenceblobs.TimerTaskInfo{timer}, filteredTasks)
 	s.Nil(lookAheadTask)
 	s.True(moreTasks)
-	timerSequenceID := timerKeyFromGogoTime(timer.VisibilityTimestamp, timer.GetTaskId())
+	timerSequenceID := timerKeyFromGogoTime(timer.VisibilityTime, timer.GetTaskId())
 	s.Equal(map[timerKey]bool{*timerSequenceID: false}, s.timerQueueAckMgr.outstandingTasks)
 	s.Equal(ackLevel, s.timerQueueAckMgr.ackLevel)
 	s.Equal(minQueryLevel, s.timerQueueAckMgr.minQueryLevel)
@@ -349,15 +349,15 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_HasLookAhead_NoNextPage() {
 	s.Equal(minQueryLevel, maxQueryLevel)
 
 	timer := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(int(s.mockShard.GetConfig().TimerProcessorMaxTimeShift().Seconds())),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(int(s.mockShard.GetConfig().TimerProcessorMaxTimeShift().Seconds())),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 
 	response := &persistence.GetTimerIndexTasksResponse{
@@ -376,7 +376,7 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_HasLookAhead_NoNextPage() {
 	s.Equal(ackLevel, s.timerQueueAckMgr.ackLevel)
 	s.Equal(s.timerQueueAckMgr.maxQueryLevel, s.timerQueueAckMgr.minQueryLevel)
 	s.Empty(s.timerQueueAckMgr.pageToken)
-	s.Equal(protoToNanos(timer.VisibilityTimestamp), s.timerQueueAckMgr.maxQueryLevel.UnixNano())
+	s.Equal(protoToNanos(timer.VisibilityTime), s.timerQueueAckMgr.maxQueryLevel.UnixNano())
 }
 
 func protoToNanos(timestamp *types.Timestamp) int64 {
@@ -396,16 +396,16 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_HasLookAhead_HasNextPage() {
 	s.Equal(minQueryLevel, maxQueryLevel)
 
 	timer := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(int(s.mockShard.GetConfig().TimerProcessorMaxTimeShift().Seconds())),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
-		Version:             int64(79),
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(int(s.mockShard.GetConfig().TimerProcessorMaxTimeShift().Seconds())),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
+		Version:         int64(79),
 	}
 
 	response := &persistence.GetTimerIndexTasksResponse{
@@ -424,43 +424,43 @@ func (s *timerQueueAckMgrSuite) TestReadTimerTasks_HasLookAhead_HasNextPage() {
 	s.Equal(ackLevel, s.timerQueueAckMgr.ackLevel)
 	s.Equal(s.timerQueueAckMgr.maxQueryLevel, s.timerQueueAckMgr.minQueryLevel)
 	s.Empty(s.timerQueueAckMgr.pageToken)
-	s.Equal(protoToNanos(timer.VisibilityTimestamp), s.timerQueueAckMgr.maxQueryLevel.UnixNano())
+	s.Equal(protoToNanos(timer.VisibilityTime), s.timerQueueAckMgr.maxQueryLevel.UnixNano())
 }
 
 func (s *timerQueueAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 	// create 3 timers, timer1 < timer2 < timer3 < now
 	timer1 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 	timer2 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: timer1.VisibilityTimestamp,
-		TaskId:              timer1.GetTaskId() + 1,
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(29),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  timer1.VisibilityTime,
+		TaskId:          timer1.GetTaskId() + 1,
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(29),
+		ScheduleAttempt: 0,
 	}
 	timer3 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: &types.Timestamp{Seconds: timer1.VisibilityTimestamp.Seconds + 1, Nanos: timer1.VisibilityTimestamp.Nanos},
-		TaskId:              timer2.GetTaskId() + 1,
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(30),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  &types.Timestamp{Seconds: timer1.VisibilityTime.Seconds + 1, Nanos: timer1.VisibilityTime.Nanos},
+		TaskId:          timer2.GetTaskId() + 1,
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(30),
+		ScheduleAttempt: 0,
 	}
 	response := &persistence.GetTimerIndexTasksResponse{
 		Timers:        []*persistenceblobs.TimerTaskInfo{timer1, timer2, timer3},
@@ -477,27 +477,27 @@ func (s *timerQueueAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 
 	// we are not testing shard context
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
-	timerSequenceID1 := timerKeyFromGogoTime(timer1.VisibilityTimestamp, timer1.GetTaskId())
+	timerSequenceID1 := timerKeyFromGogoTime(timer1.VisibilityTime, timer1.GetTaskId())
 	s.timerQueueAckMgr.completeTimerTask(timer1)
 	s.True(s.timerQueueAckMgr.outstandingTasks[*timerSequenceID1])
 	s.timerQueueAckMgr.updateAckLevel()
-	s.Equal(protoToNanos(timer1.VisibilityTimestamp), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
+	s.Equal(protoToNanos(timer1.VisibilityTime), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
 
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
-	timerSequenceID3 := timerKeyFromGogoTime(timer3.VisibilityTimestamp, timer3.GetTaskId())
+	timerSequenceID3 := timerKeyFromGogoTime(timer3.VisibilityTime, timer3.GetTaskId())
 	s.timerQueueAckMgr.completeTimerTask(timer3)
 	s.True(s.timerQueueAckMgr.outstandingTasks[*timerSequenceID3])
 	s.timerQueueAckMgr.updateAckLevel()
 	// ack level remains unchanged
-	s.Equal(protoToNanos(timer1.VisibilityTimestamp), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
+	s.Equal(protoToNanos(timer1.VisibilityTime), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
 
 	// we are not testing shard context
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
-	timerSequenceID2 := timerKeyFromGogoTime(timer2.VisibilityTimestamp, timer2.GetTaskId())
+	timerSequenceID2 := timerKeyFromGogoTime(timer2.VisibilityTime, timer2.GetTaskId())
 	s.timerQueueAckMgr.completeTimerTask(timer2)
 	s.True(s.timerQueueAckMgr.outstandingTasks[*timerSequenceID2])
 	s.timerQueueAckMgr.updateAckLevel()
-	s.Equal(protoToNanos(timer3.VisibilityTimestamp), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
+	s.Equal(protoToNanos(timer3.VisibilityTime), s.mockShard.GetTimerClusterAckLevel(s.clusterName).UnixNano())
 }
 
 func (s *timerQueueAckMgrSuite) TestReadLookAheadTask() {
@@ -509,16 +509,16 @@ func (s *timerQueueAckMgrSuite) TestReadLookAheadTask() {
 	s.timerQueueAckMgr.maxQueryLevel = s.timerQueueAckMgr.minQueryLevel
 
 	timer := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: protoLevel,
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
-		Version:             int64(79),
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  protoLevel,
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
+		Version:         int64(79),
 	}
 
 	response := &persistence.GetTimerIndexTasksResponse{
@@ -634,27 +634,27 @@ func (s *timerQueueFailoverAckMgrSuite) TestReadTimerTasks_HasNextPage() {
 	s.Equal(s.maxLevel, maxQueryLevel)
 
 	timer1 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 
 	timer2 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(60),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(60),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 
 	response := &persistence.GetTimerIndexTasksResponse{
@@ -738,37 +738,37 @@ func (s *timerQueueFailoverAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 
 	// create 3 timers, timer1 < timer2 < timer3 < now
 	timer1 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: gogoProtoTimestampNowAddDuration(-5),
-		TaskId:              int64(59),
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(28),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  gogoProtoTimestampNowAddDuration(-5),
+		TaskId:          int64(59),
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(28),
+		ScheduleAttempt: 0,
 	}
 	timer2 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: timer1.VisibilityTimestamp,
-		TaskId:              timer1.GetTaskId() + 1,
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(29),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  timer1.VisibilityTime,
+		TaskId:          timer1.GetTaskId() + 1,
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(29),
+		ScheduleAttempt: 0,
 	}
 	timer3 := &persistenceblobs.TimerTaskInfo{
-		NamespaceId:         TestNamespaceId,
-		WorkflowId:          "some random workflow ID",
-		RunId:               uuid.New(),
-		VisibilityTimestamp: &types.Timestamp{Seconds: timer1.VisibilityTimestamp.Seconds + 1, Nanos: timer1.VisibilityTimestamp.Nanos},
-		TaskId:              timer2.GetTaskId() + 1,
-		TaskType:            1,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		EventId:             int64(30),
-		ScheduleAttempt:     0,
+		NamespaceId:     TestNamespaceId,
+		WorkflowId:      "some random workflow ID",
+		RunId:           uuid.New(),
+		VisibilityTime:  &types.Timestamp{Seconds: timer1.VisibilityTime.Seconds + 1, Nanos: timer1.VisibilityTime.Nanos},
+		TaskId:          timer2.GetTaskId() + 1,
+		TaskType:        1,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		EventId:         int64(30),
+		ScheduleAttempt: 0,
 	}
 	response := &persistence.GetTimerIndexTasksResponse{
 		Timers:        []*persistenceblobs.TimerTaskInfo{timer1, timer2, timer3},
@@ -782,7 +782,7 @@ func (s *timerQueueFailoverAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 	s.Nil(lookAheadTask)
 	s.False(moreTasks)
 
-	timerSequenceID2 := timerKeyFromGogoTime(timer2.VisibilityTimestamp, timer2.GetTaskId())
+	timerSequenceID2 := timerKeyFromGogoTime(timer2.VisibilityTime, timer2.GetTaskId())
 	s.timerQueueFailoverAckMgr.completeTimerTask(timer2)
 	s.True(s.timerQueueFailoverAckMgr.outstandingTasks[*timerSequenceID2])
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
@@ -793,7 +793,7 @@ func (s *timerQueueFailoverAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 	default:
 	}
 
-	timerSequenceID3 := timerKeyFromGogoTime(timer3.VisibilityTimestamp, timer3.GetTaskId())
+	timerSequenceID3 := timerKeyFromGogoTime(timer3.VisibilityTime, timer3.GetTaskId())
 	s.timerQueueFailoverAckMgr.completeTimerTask(timer3)
 	s.True(s.timerQueueFailoverAckMgr.outstandingTasks[*timerSequenceID3])
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
@@ -804,7 +804,7 @@ func (s *timerQueueFailoverAckMgrSuite) TestReadCompleteUpdateTimerTasks() {
 	default:
 	}
 
-	timerSequenceID1 := timerKeyFromGogoTime(timer1.VisibilityTimestamp, timer1.GetTaskId())
+	timerSequenceID1 := timerKeyFromGogoTime(timer1.VisibilityTime, timer1.GetTaskId())
 	s.timerQueueFailoverAckMgr.completeTimerTask(timer1)
 	s.True(s.timerQueueFailoverAckMgr.outstandingTasks[*timerSequenceID1])
 	s.mockShardMgr.On("UpdateShard", mock.Anything).Return(nil).Once()
diff --git a/service/history/timerQueueActiveTaskExecutor.go b/service/history/timerQueueActiveTaskExecutor.go
index 3e25645fa51..1c525bfcd46 100644
--- a/service/history/timerQueueActiveTaskExecutor.go
+++ b/service/history/timerQueueActiveTaskExecutor.go
@@ -191,7 +191,7 @@ func (t *timerQueueActiveTaskExecutor) executeActivityTimeoutTask(
 	// created.
 	isHeartBeatTask := task.TimeoutType == enumspb.TIMEOUT_TYPE_HEARTBEAT
 	activityInfo, ok := mutableState.GetActivityInfo(task.GetEventId())
-	goVisibilityTS, _ := types.TimestampFromProto(task.VisibilityTimestamp)
+	goVisibilityTS, _ := types.TimestampFromProto(task.VisibilityTime)
 	if isHeartBeatTask && ok && activityInfo.LastHeartbeatTimeoutVisibilityInSeconds <= goVisibilityTS.Unix() {
 		activityInfo.TimerTaskStatus = activityInfo.TimerTaskStatus &^ timerTaskStatusCreatedHeartbeat
 		if err := mutableState.UpdateActivity(activityInfo); err != nil {
@@ -220,21 +220,21 @@ Loop:
 		}
 
 		timeoutFailure := failure.NewTimeoutFailure(timerSequenceID.timerType)
-		var retryStatus enumspb.RetryStatus
-		if retryStatus, err = mutableState.RetryActivity(
+		var retryState enumspb.RetryState
+		if retryState, err = mutableState.RetryActivity(
 			activityInfo,
 			timeoutFailure,
 		); err != nil {
 			return err
-		} else if retryStatus == enumspb.RETRY_STATUS_IN_PROGRESS {
+		} else if retryState == enumspb.RETRY_STATE_IN_PROGRESS {
 			updateMutableState = true
 			continue Loop
 		}
 
 		timeoutFailure.GetTimeoutFailureInfo().LastHeartbeatDetails = activityInfo.Details
-		// If retryStatus is Timeout then it means that expirationTime is expired.
+		// If retryState is Timeout then it means that expirationTime is expired.
 		// ExpirationTime is expired when ScheduleToClose timeout is expired.
-		if retryStatus == enumspb.RETRY_STATUS_TIMEOUT {
+		if retryState == enumspb.RETRY_STATE_TIMEOUT {
 			timeoutFailure.GetTimeoutFailureInfo().TimeoutType = enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE
 		}
 
@@ -247,7 +247,7 @@ Loop:
 			activityInfo.ScheduleID,
 			activityInfo.StartedID,
 			timeoutFailure,
-			retryStatus,
+			retryState,
 		); err != nil {
 			return err
 		}
@@ -486,7 +486,7 @@ func (t *timerQueueActiveTaskExecutor) executeWorkflowTimeoutTask(
 	eventBatchFirstEventID := mutableState.GetNextEventID()
 
 	timeoutFailure := failure.NewTimeoutFailure(enumspb.TIMEOUT_TYPE_START_TO_CLOSE)
-	backoffInterval, retryStatus := mutableState.GetRetryBackoffDuration(timeoutFailure)
+	backoffInterval, retryState := mutableState.GetRetryBackoffDuration(timeoutFailure)
 	continueAsNewInitiator := enumspb.CONTINUE_AS_NEW_INITIATOR_RETRY
 	if backoffInterval == backoff.NoBackoff {
 		// check if a cron backoff is needed
@@ -497,7 +497,7 @@ func (t *timerQueueActiveTaskExecutor) executeWorkflowTimeoutTask(
 		continueAsNewInitiator = enumspb.CONTINUE_AS_NEW_INITIATOR_CRON_SCHEDULE
 	}
 	if backoffInterval == backoff.NoBackoff {
-		if err := timeoutWorkflow(mutableState, eventBatchFirstEventID, retryStatus); err != nil {
+		if err := timeoutWorkflow(mutableState, eventBatchFirstEventID, retryState); err != nil {
 			return err
 		}
 
diff --git a/service/history/timerQueueActiveTaskExecutor_test.go b/service/history/timerQueueActiveTaskExecutor_test.go
index 6a1f165fae3..e52ad2a767d 100644
--- a/service/history/timerQueueActiveTaskExecutor_test.go
+++ b/service/history/timerQueueActiveTaskExecutor_test.go
@@ -225,15 +225,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessUserTimerTimeout_Fire() {
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.UserTimerTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_USER_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_USER_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -297,15 +297,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessUserTimerTimeout_Noop() {
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.UserTimerTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_USER_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_USER_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	event = addTimerFiredEvent(mutableState, timerID)
@@ -373,15 +373,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_NoRetryPo
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -454,15 +454,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_NoRetryPo
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        di.ScheduleID,
 	}
 
 	completeEvent := addActivityTaskCompletedEvent(mutableState, scheduledEvent.GetEventId(), startedEvent.GetEventId(), nil, identity)
@@ -541,15 +541,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_RetryPoli
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -630,15 +630,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_RetryPoli
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -718,15 +718,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_RetryPoli
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        di.ScheduleID,
 	}
 
 	completeEvent := addActivityTaskCompletedEvent(mutableState, scheduledEvent.GetEventId(), common.TransientEventID, nil, identity)
@@ -805,15 +805,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestProcessActivityTimeout_Heartbeat
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp().Add(-time.Second))
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_HEARTBEAT,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             scheduledEvent.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_HEARTBEAT,
+		VisibilityTime: protoTaskTime,
+		EventId:        scheduledEvent.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -853,15 +853,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestDecisionTimeout_Fire() {
 	protoTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_DECISION_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_DECISION_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, startedEvent.GetEventId(), startedEvent.GetVersion())
@@ -909,15 +909,15 @@ func (s *timerQueueActiveTaskExecutorSuite) TestDecisionTimeout_Noop() {
 	protoTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_DECISION_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTime,
-		EventId:             di.ScheduleID - 1,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_DECISION_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTime,
+		EventId:        di.ScheduleID - 1,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, startedEvent.GetEventId(), startedEvent.GetVersion())
@@ -961,7 +961,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowBackoffTimer_Fire() {
 		TaskId:              int64(100),
 		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
 		WorkflowBackoffType: enumsspb.WORKFLOW_BACKOFF_TYPE_RETRY,
-		VisibilityTimestamp: protoTaskTime,
+		VisibilityTime:      protoTaskTime,
 		EventId:             0,
 	}
 
@@ -1019,7 +1019,7 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowBackoffTimer_Noop() {
 		TaskId:              int64(100),
 		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
 		WorkflowBackoffType: enumsspb.WORKFLOW_BACKOFF_TYPE_RETRY,
-		VisibilityTimestamp: protoTaskTime,
+		VisibilityTime:      protoTaskTime,
 		EventId:             0,
 	}
 
@@ -1087,16 +1087,16 @@ func (s *timerQueueActiveTaskExecutorSuite) TestActivityRetryTimer_Fire() {
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             activityInfo.ScheduleID,
-		ScheduleAttempt:     int64(activityInfo.Attempt),
+		Version:         s.version,
+		NamespaceId:     s.namespaceID,
+		WorkflowId:      execution.GetWorkflowId(),
+		RunId:           execution.GetRunId(),
+		TaskId:          int64(100),
+		TaskType:        enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime:  protoTaskTime,
+		EventId:         activityInfo.ScheduleID,
+		ScheduleAttempt: int64(activityInfo.Attempt),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -1178,16 +1178,16 @@ func (s *timerQueueActiveTaskExecutorSuite) TestActivityRetryTimer_Noop() {
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             activityInfo.ScheduleID,
-		ScheduleAttempt:     int64(activityInfo.Attempt),
+		Version:         s.version,
+		NamespaceId:     s.namespaceID,
+		WorkflowId:      execution.GetWorkflowId(),
+		RunId:           execution.GetRunId(),
+		TaskId:          int64(100),
+		TaskType:        enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
+		TimeoutType:     enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime:  protoTaskTime,
+		EventId:         activityInfo.ScheduleID,
+		ScheduleAttempt: int64(activityInfo.Attempt),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -1229,14 +1229,14 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowTimeout_Fire() {
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, completionEvent.GetEventId(), completionEvent.GetVersion())
@@ -1291,14 +1291,14 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowTimeout_ContinueAsNew_Re
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, completionEvent.GetEventId(), completionEvent.GetVersion())
@@ -1350,14 +1350,14 @@ func (s *timerQueueActiveTaskExecutorSuite) TestWorkflowTimeout_ContinueAsNew_Cr
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, completionEvent.GetEventId(), completionEvent.GetVersion())
diff --git a/service/history/timerQueueProcessorBase.go b/service/history/timerQueueProcessorBase.go
index 9d5e17370d6..d0213fdea79 100644
--- a/service/history/timerQueueProcessorBase.go
+++ b/service/history/timerQueueProcessorBase.go
@@ -289,7 +289,7 @@ func (t *timerQueueProcessorBase) internalProcessor() error {
 					return err
 				}
 				if lookAheadTimer != nil {
-					visTs, err := types.TimestampFromProto(lookAheadTimer.VisibilityTimestamp)
+					visTs, err := types.TimestampFromProto(lookAheadTimer.VisibilityTime)
 					if err != nil {
 						return err
 					}
@@ -313,7 +313,7 @@ func (t *timerQueueProcessorBase) internalProcessor() error {
 					return err
 				}
 				if lookAheadTimer != nil {
-					visTs, err := types.TimestampFromProto(lookAheadTimer.VisibilityTimestamp)
+					visTs, err := types.TimestampFromProto(lookAheadTimer.VisibilityTime)
 					if err != nil {
 						return err
 					}
diff --git a/service/history/timerQueueStandbyTaskExecutor.go b/service/history/timerQueueStandbyTaskExecutor.go
index 43fed155201..a5d4721e39c 100644
--- a/service/history/timerQueueStandbyTaskExecutor.go
+++ b/service/history/timerQueueStandbyTaskExecutor.go
@@ -132,7 +132,7 @@ func (t *timerQueueStandbyTaskExecutor) executeUserTimerTimeoutTask(
 				return nil, serviceerror.NewInternal(errString)
 			}
 
-			t, _ := types.TimestampFromProto(timerTask.VisibilityTimestamp)
+			t, _ := types.TimestampFromProto(timerTask.VisibilityTime)
 			if isExpired := timerSequence.isExpired(
 				t,
 				timerSequenceID,
@@ -191,7 +191,7 @@ func (t *timerQueueStandbyTaskExecutor) executeActivityTimeoutTask(
 				return nil, serviceerror.NewInternal(errString)
 			}
 
-			t, _ := types.TimestampFromProto(timerTask.VisibilityTimestamp)
+			t, _ := types.TimestampFromProto(timerTask.VisibilityTime)
 			if isExpired := timerSequence.isExpired(
 				t,
 				timerSequenceID,
@@ -219,7 +219,7 @@ func (t *timerQueueStandbyTaskExecutor) executeActivityTimeoutTask(
 		// created.
 		isHeartBeatTask := timerTask.TimeoutType == enumspb.TIMEOUT_TYPE_HEARTBEAT
 		activityInfo, ok := mutableState.GetActivityInfo(timerTask.GetEventId())
-		goTS, _ := types.TimestampFromProto(timerTask.VisibilityTimestamp)
+		goTS, _ := types.TimestampFromProto(timerTask.VisibilityTime)
 		if isHeartBeatTask && ok && activityInfo.LastHeartbeatTimeoutVisibilityInSeconds <= goTS.Unix() {
 			activityInfo.TimerTaskStatus = activityInfo.TimerTaskStatus &^ timerTaskStatusCreatedHeartbeat
 			if err := mutableState.UpdateActivity(activityInfo); err != nil {
diff --git a/service/history/timerQueueStandbyTaskExecutor_test.go b/service/history/timerQueueStandbyTaskExecutor_test.go
index d909e473bea..5b0cd83bbc7 100644
--- a/service/history/timerQueueStandbyTaskExecutor_test.go
+++ b/service/history/timerQueueStandbyTaskExecutor_test.go
@@ -228,15 +228,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Pending
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.UserTimerTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_USER_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_USER_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -302,15 +302,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Success
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.UserTimerTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_USER_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_USER_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	event = addTimerFiredEvent(mutableState, timerID)
@@ -369,15 +369,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessUserTimerTimeout_Multipl
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.UserTimerTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_USER_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_USER_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	event = addTimerFiredEvent(mutableState, timerID1)
@@ -436,15 +436,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Pending(
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.EventId,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.EventId,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, scheduledEvent.GetEventId(), scheduledEvent.GetVersion())
@@ -515,15 +515,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Success(
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp())
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
+		EventId:        event.GetEventId(),
 	}
 
 	completeEvent := addActivityTaskCompletedEvent(mutableState, scheduledEvent.GetEventId(), startedEvent.GetEventId(), nil, identity)
@@ -584,15 +584,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Heartbea
 	protoTaskTime, err := types.TimestampProto(task.(*persistence.ActivityTimeoutTask).GetVisibilityTimestamp().Add(-time.Second))
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_HEARTBEAT,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             scheduledEvent.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_HEARTBEAT,
+		VisibilityTime: protoTaskTime,
+		EventId:        scheduledEvent.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, startedEvent.GetEventId(), startedEvent.GetVersion())
@@ -659,15 +659,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessActivityTimeout_Multiple
 	protoTime, err := types.TimestampProto(activityInfo2.LastHeartBeatUpdatedTime.Add(-5 * time.Second))
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_HEARTBEAT,
-		VisibilityTimestamp: protoTime,
-		EventId:             scheduledEvent2.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_HEARTBEAT,
+		VisibilityTime: protoTime,
+		EventId:        scheduledEvent2.GetEventId(),
 	}
 
 	completeEvent1 := addActivityTaskCompletedEvent(mutableState, scheduledEvent1.GetEventId(), startedEvent1.GetEventId(), nil, identity)
@@ -748,15 +748,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessDecisionTimeout_Pending(
 	protoTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_DECISION_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_DECISION_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, startedEvent.GetEventId(), startedEvent.GetVersion())
@@ -792,15 +792,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessDecisionTimeout_Schedule
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_DECISION_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
-		VisibilityTimestamp: protoTaskTime,
-		EventId:             decisionScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_DECISION_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_SCHEDULE_TO_START,
+		VisibilityTime: protoTaskTime,
+		EventId:        decisionScheduleID,
 	}
 
 	s.mockShard.SetCurrentTime(s.clusterName, s.now)
@@ -840,15 +840,15 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessDecisionTimeout_Success(
 	protoTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_DECISION_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTime,
-		EventId:             di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_DECISION_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTime,
+		EventId:        di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -887,13 +887,13 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowBackoffTimer_Pen
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -946,13 +946,13 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowBackoffTimer_Suc
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_BACKOFF_TIMER,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, di.ScheduleID, di.Version)
@@ -996,14 +996,14 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTimeout_Pending(
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, completionEvent.GetEventId(), completionEvent.GetVersion())
@@ -1060,14 +1060,14 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessWorkflowTimeout_Success(
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_WORKFLOW_RUN_TIMEOUT,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -1105,14 +1105,14 @@ func (s *timerQueueStandbyTaskExecutorSuite) TestProcessRetryTimeout() {
 	protoTaskTime, err := types.TimestampProto(s.now)
 	s.NoError(err)
 	timerTask := &persistenceblobs.TimerTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		TaskId:              int64(100),
-		TaskType:            enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
-		TimeoutType:         enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
-		VisibilityTimestamp: protoTaskTime,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		TaskId:         int64(100),
+		TaskType:       enumsspb.TASK_TYPE_ACTIVITY_RETRY_TIMER,
+		TimeoutType:    enumspb.TIMEOUT_TYPE_START_TO_CLOSE,
+		VisibilityTime: protoTaskTime,
 	}
 
 	s.mockShard.SetCurrentTime(s.clusterName, s.now)
diff --git a/service/history/timerQueueTaskExecutorBase.go b/service/history/timerQueueTaskExecutorBase.go
index 4d7cc4cdcb1..7d32fc66c47 100644
--- a/service/history/timerQueueTaskExecutorBase.go
+++ b/service/history/timerQueueTaskExecutorBase.go
@@ -101,7 +101,7 @@ func (t *timerQueueTaskExecutorBase) executeDeleteHistoryEventTask(
 		return err
 	}
 	clusterConfiguredForHistoryArchival := t.shard.GetService().GetArchivalMetadata().GetHistoryConfig().ClusterConfiguredForArchival()
-	namespaceConfiguredForHistoryArchival := namespaceCacheEntry.GetConfig().HistoryArchivalStatus == enumspb.ARCHIVAL_STATUS_ENABLED
+	namespaceConfiguredForHistoryArchival := namespaceCacheEntry.GetConfig().HistoryArchivalState == enumspb.ARCHIVAL_STATE_ENABLED
 	archiveHistory := clusterConfiguredForHistoryArchival && namespaceConfiguredForHistoryArchival
 
 	// TODO: @ycyang once archival backfill is in place cluster:paused && namespace:enabled should be a nop rather than a delete
diff --git a/service/history/timerQueueTaskExecutorBase_test.go b/service/history/timerQueueTaskExecutorBase_test.go
index 01fbda16680..a5ed6789549 100644
--- a/service/history/timerQueueTaskExecutorBase_test.go
+++ b/service/history/timerQueueTaskExecutorBase_test.go
@@ -128,8 +128,8 @@ func (s *timerQueueTaskExecutorBaseSuite) TearDownTest() {
 
 func (s *timerQueueTaskExecutorBaseSuite) TestDeleteWorkflow_NoErr() {
 	task := &persistenceblobs.TimerTaskInfo{
-		TaskId:              12345,
-		VisibilityTimestamp: types.TimestampNow(),
+		TaskId:         12345,
+		VisibilityTime: types.TimestampNow(),
 	}
 	executionInfo := commonpb.WorkflowExecution{
 		WorkflowId: task.GetWorkflowId(),
diff --git a/service/history/transferQueueStandbyTaskExecutor_test.go b/service/history/transferQueueStandbyTaskExecutor_test.go
index 4f7de71e7ee..39a0a73d4c3 100644
--- a/service/history/transferQueueStandbyTaskExecutor_test.go
+++ b/service/history/transferQueueStandbyTaskExecutor_test.go
@@ -215,15 +215,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Pending(
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -271,15 +271,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Pending_
 	now := types.TimestampNow()
 	s.mockShard.SetCurrentTime(s.clusterName, time.Unix(now.Seconds, int64(now.Nanos)).UTC().Add(s.fetchHistoryDuration))
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -327,15 +327,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessActivityTask_Success(
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_ACTIVITY_TASK,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	event = addActivityTaskStartedEvent(mutableState, event.GetEventId(), "")
@@ -377,15 +377,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessDecisionTask_Pending(
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
-		ScheduleId:          di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
+		ScheduleId:     di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, di.ScheduleID, di.Version)
@@ -426,15 +426,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessDecisionTask_Pending_
 	now := types.TimestampNow()
 	s.mockShard.SetCurrentTime(s.clusterName, time.Unix(now.Seconds, int64(now.Nanos)).UTC().Add(s.fetchHistoryDuration))
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
-		ScheduleId:          di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
+		ScheduleId:     di.ScheduleID,
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, di.ScheduleID, di.Version)
@@ -475,15 +475,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessDecisionTask_Success_
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
-		ScheduleId:          di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
+		ScheduleId:     di.ScheduleID,
 	}
 
 	event := addDecisionTaskStartedEvent(mutableState, di.ScheduleID, taskQueueName, uuid.New())
@@ -531,15 +531,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessDecisionTask_Success_
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
-		ScheduleId:          di.ScheduleID,
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_DECISION_TASK,
+		ScheduleId:     di.ScheduleID,
 	}
 
 	event = addDecisionTaskStartedEvent(mutableState, di.ScheduleID, taskQueueName, uuid.New())
@@ -587,15 +587,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCloseExecution() {
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_CLOSE_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_CLOSE_EXECUTION,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -648,18 +648,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCancelExecution_Pendi
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testTargetNamespaceID,
-		TargetWorkflowId:    targetExecution.GetWorkflowId(),
-		TargetRunId:         targetExecution.GetRunId(),
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_CANCEL_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testTargetNamespaceID,
+		TargetWorkflowId:  targetExecution.GetWorkflowId(),
+		TargetRunId:       targetExecution.GetRunId(),
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_CANCEL_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -722,18 +722,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessCancelExecution_Succe
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testTargetNamespaceID,
-		TargetWorkflowId:    targetExecution.GetWorkflowId(),
-		TargetRunId:         targetExecution.GetRunId(),
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_CANCEL_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testTargetNamespaceID,
+		TargetWorkflowId:  targetExecution.GetWorkflowId(),
+		TargetRunId:       targetExecution.GetRunId(),
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_CANCEL_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	event = addCancelRequestedEvent(mutableState, event.GetEventId(), testTargetNamespaceID, targetExecution.GetWorkflowId(), targetExecution.GetRunId())
@@ -788,18 +788,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessSignalExecution_Pendi
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testTargetNamespaceID,
-		TargetWorkflowId:    targetExecution.GetWorkflowId(),
-		TargetRunId:         targetExecution.GetRunId(),
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_SIGNAL_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testTargetNamespaceID,
+		TargetWorkflowId:  targetExecution.GetWorkflowId(),
+		TargetRunId:       targetExecution.GetRunId(),
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_SIGNAL_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -864,18 +864,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessSignalExecution_Succe
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testTargetNamespaceID,
-		TargetWorkflowId:    targetExecution.GetWorkflowId(),
-		TargetRunId:         targetExecution.GetRunId(),
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_SIGNAL_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testTargetNamespaceID,
+		TargetWorkflowId:  targetExecution.GetWorkflowId(),
+		TargetRunId:       targetExecution.GetRunId(),
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_SIGNAL_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	event = addSignaledEvent(mutableState, event.GetEventId(), testTargetNamespace, targetExecution.GetWorkflowId(), targetExecution.GetRunId(), "")
@@ -928,18 +928,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_P
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testChildNamespaceID,
-		TargetWorkflowId:    childWorkflowID,
-		TargetRunId:         "",
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_START_CHILD_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testChildNamespaceID,
+		TargetWorkflowId:  childWorkflowID,
+		TargetRunId:       "",
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_START_CHILD_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, event.GetEventId(), event.GetVersion())
@@ -1003,18 +1003,18 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessStartChildExecution_S
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TargetNamespaceId:   testChildNamespaceID,
-		TargetWorkflowId:    childWorkflowID,
-		TargetRunId:         "",
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_START_CHILD_EXECUTION,
-		ScheduleId:          event.GetEventId(),
+		Version:           s.version,
+		NamespaceId:       s.namespaceID,
+		WorkflowId:        execution.GetWorkflowId(),
+		RunId:             execution.GetRunId(),
+		VisibilityTime:    now,
+		TargetNamespaceId: testChildNamespaceID,
+		TargetWorkflowId:  childWorkflowID,
+		TargetRunId:       "",
+		TaskId:            taskID,
+		TaskQueue:         taskQueueName,
+		TaskType:          enumsspb.TASK_TYPE_TRANSFER_START_CHILD_EXECUTION,
+		ScheduleId:        event.GetEventId(),
 	}
 
 	event = addChildWorkflowExecutionStartedEvent(mutableState, event.GetEventId(), testChildNamespace, childWorkflowID, uuid.New(), childWorkflowType)
@@ -1058,15 +1058,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessRecordWorkflowStarted
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_RECORD_WORKFLOW_STARTED,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_RECORD_WORKFLOW_STARTED,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, di.ScheduleID, di.Version)
@@ -1121,15 +1121,15 @@ func (s *transferQueueStandbyTaskExecutorSuite) TestProcessUpsertWorkflowSearchA
 
 	now := types.TimestampNow()
 	transferTask := &persistenceblobs.TransferTaskInfo{
-		Version:             s.version,
-		NamespaceId:         s.namespaceID,
-		WorkflowId:          execution.GetWorkflowId(),
-		RunId:               execution.GetRunId(),
-		VisibilityTimestamp: now,
-		TaskId:              taskID,
-		TaskQueue:           taskQueueName,
-		TaskType:            enumsspb.TASK_TYPE_TRANSFER_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES,
-		ScheduleId:          event.GetEventId(),
+		Version:        s.version,
+		NamespaceId:    s.namespaceID,
+		WorkflowId:     execution.GetWorkflowId(),
+		RunId:          execution.GetRunId(),
+		VisibilityTime: now,
+		TaskId:         taskID,
+		TaskQueue:      taskQueueName,
+		TaskType:       enumsspb.TASK_TYPE_TRANSFER_UPSERT_WORKFLOW_SEARCH_ATTRIBUTES,
+		ScheduleId:     event.GetEventId(),
 	}
 
 	persistenceMutableState := s.createPersistenceMutableState(mutableState, di.ScheduleID, di.Version)
diff --git a/service/history/transferQueueTaskExecutorBase.go b/service/history/transferQueueTaskExecutorBase.go
index b037a3a012d..bcaaf722ecb 100644
--- a/service/history/transferQueueTaskExecutorBase.go
+++ b/service/history/transferQueueTaskExecutorBase.go
@@ -278,7 +278,7 @@ func (t *transferQueueTaskExecutorBase) recordWorkflowClosed(
 		}
 
 		clusterConfiguredForVisibilityArchival := t.shard.GetService().GetArchivalMetadata().GetVisibilityConfig().ClusterConfiguredForArchival()
-		namespaceConfiguredForVisibilityArchival := namespaceEntry.GetConfig().VisibilityArchivalStatus == enumspb.ARCHIVAL_STATUS_ENABLED
+		namespaceConfiguredForVisibilityArchival := namespaceEntry.GetConfig().VisibilityArchivalState == enumspb.ARCHIVAL_STATE_ENABLED
 		archiveVisibility = clusterConfiguredForVisibilityArchival && namespaceConfiguredForVisibilityArchival
 	}
 
diff --git a/service/history/workflowExecutionUtil.go b/service/history/workflowExecutionUtil.go
index 0bbfc38b3b2..80a3c8ae6b3 100644
--- a/service/history/workflowExecutionUtil.go
+++ b/service/history/workflowExecutionUtil.go
@@ -176,7 +176,7 @@ func retryWorkflow(
 func timeoutWorkflow(
 	mutableState mutableState,
 	eventBatchFirstEventID int64,
-	retryStatus enumspb.RetryStatus,
+	retryState enumspb.RetryState,
 ) error {
 
 	if decision, ok := mutableState.GetInFlightDecision(); ok {
@@ -191,7 +191,7 @@ func timeoutWorkflow(
 
 	_, err := mutableState.AddTimeoutWorkflowEvent(
 		eventBatchFirstEventID,
-		retryStatus,
+		retryState,
 	)
 	return err
 }
diff --git a/service/history/workflowResetor.go b/service/history/workflowResetor.go
index 96f1a984c42..e6bafcba0c9 100644
--- a/service/history/workflowResetor.go
+++ b/service/history/workflowResetor.go
@@ -206,7 +206,7 @@ func (w *workflowResetorImpl) failStartedActivities(msBuilder mutableState) erro
 				ai.ScheduleID,
 				ai.StartedID,
 				failure.NewResetWorkflowFailure("reset workflow", ai.Details),
-				enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE,
+				enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE,
 				ai.StartedIdentity,
 			); err != nil {
 				// Unable to add ActivityTaskFailed event to history
diff --git a/service/history/workflowResetter.go b/service/history/workflowResetter.go
index ae398fa1587..a6b3ed57370 100644
--- a/service/history/workflowResetter.go
+++ b/service/history/workflowResetter.go
@@ -392,7 +392,7 @@ func (r *workflowResetterImpl) failInflightActivity(
 				ai.ScheduleID,
 				ai.StartedID,
 				failure.NewResetWorkflowFailure(terminateReason, ai.Details),
-				enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE,
+				enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE,
 				ai.StartedIdentity,
 			); err != nil {
 				return err
diff --git a/service/history/workflowResetter_test.go b/service/history/workflowResetter_test.go
index 734fe7f0f5c..c66ba41ad8c 100644
--- a/service/history/workflowResetter_test.go
+++ b/service/history/workflowResetter_test.go
@@ -292,7 +292,7 @@ func (s *workflowResetterSuite) TestFailInflightActivity() {
 		activity1.ScheduleID,
 		activity1.StartedID,
 		failure.NewResetWorkflowFailure(terminateReason, activity1.Details),
-		enumspb.RETRY_STATUS_NON_RETRYABLE_FAILURE,
+		enumspb.RETRY_STATE_NON_RETRYABLE_FAILURE,
 		activity1.StartedIdentity,
 	).Return(&historypb.HistoryEvent{}, nil).Times(1)
 
diff --git a/service/matching/forwarder.go b/service/matching/forwarder.go
index 947ff6d749f..9e857896cfe 100644
--- a/service/matching/forwarder.go
+++ b/service/matching/forwarder.go
@@ -136,7 +136,7 @@ func (fwdr *Forwarder) ForwardTask(ctx context.Context, task *internalTask) erro
 	var err error
 
 	// todo: Vet recomputing ScheduleToStart and rechecking expiry here
-	expiryGo, err := types.TimestampFromProto(task.event.Data.Expiry)
+	expiryGo, err := types.TimestampFromProto(task.event.Data.ExpiryTime)
 	if err != nil {
 		return err
 	}
diff --git a/service/matching/forwarder_test.go b/service/matching/forwarder_test.go
index 5fc65eb7e68..eb5fc1a3142 100644
--- a/service/matching/forwarder_test.go
+++ b/service/matching/forwarder_test.go
@@ -106,7 +106,7 @@ func (t *ForwarderTestSuite) TestForwardDecisionTask() {
 	t.Equal(taskInfo.Data.GetScheduleId(), request.GetScheduleId())
 
 	schedToStart := request.GetScheduleToStartTimeoutSeconds()
-	rewritten := convert.Int32Ceil(time.Until(*timestamp.TimestampFromProto(taskInfo.Data.Expiry).ToTime()).Seconds())
+	rewritten := convert.Int32Ceil(time.Until(*timestamp.TimestampFromProto(taskInfo.Data.ExpiryTime).ToTime()).Seconds())
 	t.Equal(schedToStart, rewritten)
 	t.Equal(t.taskQueue.name, request.GetForwardedFrom())
 }
@@ -132,7 +132,7 @@ func (t *ForwarderTestSuite) TestForwardActivityTask() {
 	t.Equal(taskInfo.Data.GetWorkflowId(), request.GetExecution().GetWorkflowId())
 	t.Equal(taskInfo.Data.GetRunId(), request.GetExecution().GetRunId())
 	t.Equal(taskInfo.Data.GetScheduleId(), request.GetScheduleId())
-	t.EqualValues(convert.Int32Ceil(time.Until(*timestamp.TimestampFromProto(taskInfo.Data.Expiry).ToTime()).Seconds()),
+	t.EqualValues(convert.Int32Ceil(time.Until(*timestamp.TimestampFromProto(taskInfo.Data.ExpiryTime).ToTime()).Seconds()),
 		request.GetScheduleToStartTimeoutSeconds())
 	t.Equal(t.taskQueue.name, request.GetForwardedFrom())
 }
diff --git a/service/matching/matcher_test.go b/service/matching/matcher_test.go
index 4971c335b1f..6cff2f922b0 100644
--- a/service/matching/matcher_test.go
+++ b/service/matching/matcher_test.go
@@ -486,8 +486,8 @@ func randomTaskInfo() *persistenceblobs.AllocatedTaskInfo {
 			WorkflowId:  uuid.New(),
 			RunId:       uuid.New(),
 			ScheduleId:  rand.Int63(),
-			CreatedTime: timestamp.TimestampFromTime(&rt1).ToProto(),
-			Expiry:      timestamp.TimestampFromTime(&rt2).ToProto(),
+			CreateTime:  timestamp.TimestampFromTime(&rt1).ToProto(),
+			ExpiryTime:  timestamp.TimestampFromTime(&rt2).ToProto(),
 		},
 		TaskId: rand.Int63(),
 	}
diff --git a/service/matching/matchingEngine.go b/service/matching/matchingEngine.go
index 133804a7f4a..2e46d0a605a 100644
--- a/service/matching/matchingEngine.go
+++ b/service/matching/matchingEngine.go
@@ -254,8 +254,8 @@ func (e *matchingEngineImpl) AddDecisionTask(
 		RunId:       addRequest.Execution.GetRunId(),
 		WorkflowId:  addRequest.Execution.GetWorkflowId(),
 		ScheduleId:  addRequest.GetScheduleId(),
-		Expiry:      expiry,
-		CreatedTime: now,
+		ExpiryTime:  expiry,
+		CreateTime:  now,
 	}
 
 	return tlMgr.AddTask(hCtx.Context, addTaskParams{
@@ -301,8 +301,8 @@ func (e *matchingEngineImpl) AddActivityTask(
 		RunId:       runID,
 		WorkflowId:  addRequest.Execution.GetWorkflowId(),
 		ScheduleId:  addRequest.GetScheduleId(),
-		CreatedTime: now,
-		Expiry:      expiry,
+		CreateTime:  now,
+		ExpiryTime:  expiry,
 	}
 
 	return tlMgr.AddTask(hCtx.Context, addTaskParams{
@@ -365,7 +365,7 @@ pollLoop:
 			})
 			if err != nil {
 				// will notify query client that the query task failed
-				e.deliverQueryResult(task.query.taskID, &queryResult{internalError: err}) //nolint:errcheck
+				e.deliverQueryResult(task.query.taskID, &queryResult{internalError: err}) // nolint:errcheck
 				return emptyPollForDecisionTaskResponse, nil
 			}
 
@@ -721,7 +721,7 @@ func (e *matchingEngineImpl) createPollForDecisionTaskResponse(
 		}
 		serializedToken, _ = e.tokenSerializer.Serialize(taskToken)
 		if task.responseC == nil {
-			ct, _ := types.TimestampFromProto(task.event.Data.CreatedTime)
+			ct, _ := types.TimestampFromProto(task.event.Data.CreateTime)
 			scope.RecordTimer(metrics.AsyncMatchLatencyPerTaskQueue, time.Since(ct))
 		}
 	}
@@ -753,7 +753,7 @@ func (e *matchingEngineImpl) createPollForActivityTaskResponse(
 		panic("ActivityTaskScheduledEventAttributes.ActivityID is not set")
 	}
 	if task.responseC == nil {
-		ct, _ := types.TimestampFromProto(task.event.Data.CreatedTime)
+		ct, _ := types.TimestampFromProto(task.event.Data.CreateTime)
 		scope.RecordTimer(metrics.AsyncMatchLatencyPerTaskQueue, time.Since(ct))
 	}
 
diff --git a/service/matching/taskQueueManager_test.go b/service/matching/taskQueueManager_test.go
index f86c44ed300..3ddfe8ff831 100644
--- a/service/matching/taskQueueManager_test.go
+++ b/service/matching/taskQueueManager_test.go
@@ -108,15 +108,15 @@ func TestReadLevelForAllExpiredTasksInBatch(t *testing.T) {
 	tasks := []*persistenceblobs.AllocatedTaskInfo{
 		{
 			Data: &persistenceblobs.TaskInfo{
-				Expiry:      timestamp.TimestampNowAddSeconds(-60).ToProto(),
-				CreatedTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
+				ExpiryTime: timestamp.TimestampNowAddSeconds(-60).ToProto(),
+				CreateTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
 			},
 			TaskId: 11,
 		},
 		{
 			Data: &persistenceblobs.TaskInfo{
-				Expiry:      timestamp.TimestampNowAddSeconds(-60).ToProto(),
-				CreatedTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
+				ExpiryTime: timestamp.TimestampNowAddSeconds(-60).ToProto(),
+				CreateTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
 			},
 			TaskId: 12,
 		},
@@ -130,15 +130,15 @@ func TestReadLevelForAllExpiredTasksInBatch(t *testing.T) {
 	require.True(t, tlm.taskReader.addTasksToBuffer([]*persistenceblobs.AllocatedTaskInfo{
 		{
 			Data: &persistenceblobs.TaskInfo{
-				Expiry:      timestamp.TimestampNowAddSeconds(-60).ToProto(),
-				CreatedTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
+				ExpiryTime: timestamp.TimestampNowAddSeconds(-60).ToProto(),
+				CreateTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
 			},
 			TaskId: 13,
 		},
 		{
 			Data: &persistenceblobs.TaskInfo{
-				Expiry:      timestamp.TimestampNowAddSeconds(-60).ToProto(),
-				CreatedTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
+				ExpiryTime: timestamp.TimestampNowAddSeconds(-60).ToProto(),
+				CreateTime: timestamp.TimestampNowAddSeconds(-60 * 60).ToProto(),
 			},
 			TaskId: 14,
 		},
diff --git a/service/worker/scanner/taskqueue/handler.go b/service/worker/scanner/taskqueue/handler.go
index ee5384fb303..d8afae827e3 100644
--- a/service/worker/scanner/taskqueue/handler.go
+++ b/service/worker/scanner/taskqueue/handler.go
@@ -146,7 +146,7 @@ func (s *Scavenger) deleteHandlerLog(key *p.TaskQueueKey, state *taskQueueState,
 }
 
 func IsTaskExpired(t *persistenceblobs.AllocatedTaskInfo) bool {
-	tExpiry := timestamp.TimestampFromProto(t.Data.Expiry)
+	tExpiry := timestamp.TimestampFromProto(t.Data.ExpiryTime)
 	tEpoch := timestamp.TimestampEpoch()
 	tNow := timestamp.TimestampNow()
 	return tExpiry.After(tEpoch) && tNow.After(tExpiry)
diff --git a/service/worker/scanner/taskqueue/mocks_test.go b/service/worker/scanner/taskqueue/mocks_test.go
index 1f5b9d349eb..d22d01d797f 100644
--- a/service/worker/scanner/taskqueue/mocks_test.go
+++ b/service/worker/scanner/taskqueue/mocks_test.go
@@ -61,14 +61,14 @@ func newMockTaskTable() *mockTaskTable {
 func (tbl *mockTaskQueueTable) generate(name string, idle bool) {
 	tq := p.PersistedTaskQueueInfo{
 		Data: &persistenceblobs.TaskQueueInfo{
-			NamespaceId: uuid.New(),
-			Name:        name,
-			LastUpdated: types.TimestampNow(),
+			NamespaceId:    uuid.New(),
+			Name:           name,
+			LastUpdateTime: types.TimestampNow(),
 		},
 		RangeID: 22,
 	}
 	if idle {
-		tq.Data.LastUpdated, _ = types.TimestampProto(time.Unix(1000, 1000))
+		tq.Data.LastUpdateTime, _ = types.TimestampProto(time.Unix(1000, 1000))
 	}
 	tbl.info = append(tbl.info, &tq)
 }
@@ -124,12 +124,12 @@ func (tbl *mockTaskTable) generate(count int, expired bool) {
 				WorkflowId:  tbl.workflowID,
 				RunId:       tbl.runID,
 				ScheduleId:  3,
-				Expiry:      exp,
+				ExpiryTime:  exp,
 			},
 			TaskId: tbl.nextTaskID,
 		}
 		if expired {
-			ti.Data.Expiry, _ = types.TimestampProto(time.Unix(0, time.Now().UnixNano()-int64(time.Second*33)))
+			ti.Data.ExpiryTime, _ = types.TimestampProto(time.Unix(0, time.Now().UnixNano()-int64(time.Second*33)))
 		}
 		tbl.tasks = append(tbl.tasks, ti)
 		tbl.nextTaskID++
diff --git a/service/worker/scanner/taskqueue/scavenger.go b/service/worker/scanner/taskqueue/scavenger.go
index fd71701c53b..ecb917aa480 100644
--- a/service/worker/scanner/taskqueue/scavenger.go
+++ b/service/worker/scanner/taskqueue/scavenger.go
@@ -209,7 +209,7 @@ func (s *Scavenger) newTask(info *p.PersistedTaskQueueInfo) executor.Task {
 		},
 		taskQueueState: taskQueueState{
 			rangeID:     info.RangeID,
-			lastUpdated: *info.Data.LastUpdated,
+			lastUpdated: *info.Data.LastUpdateTime,
 		},
 		scvg: s,
 	}
diff --git a/tools/cli/adminDLQCommands.go b/tools/cli/adminDLQCommands.go
index 108245f76a0..a092727d8c5 100644
--- a/tools/cli/adminDLQCommands.go
+++ b/tools/cli/adminDLQCommands.go
@@ -64,7 +64,7 @@ func AdminGetDLQMessages(c *cli.Context) {
 	}
 
 	paginationFunc := func(paginationToken []byte) ([]interface{}, []byte, error) {
-		resp, err := adminClient.ReadDLQMessages(ctx, &adminservice.ReadDLQMessagesRequest{
+		resp, err := adminClient.GetDLQMessages(ctx, &adminservice.GetDLQMessagesRequest{
 			Type:                  toQueueType(dlqType),
 			InclusiveEndMessageId: lastMessageID,
 			MaximumPageSize:       defaultPageSize,
diff --git a/tools/cli/flags.go b/tools/cli/flags.go
index 293d1047282..15ea62cc9b0 100644
--- a/tools/cli/flags.go
+++ b/tools/cli/flags.go
@@ -28,207 +28,207 @@ import "github.com/urfave/cli"
 
 // Flags used to specify cli command line arguments
 const (
-	FlagUsername                          = "username"
-	FlagPassword                          = "password"
-	FlagKeyspace                          = "keyspace"
-	FlagAddress                           = "address"
-	FlagAddressWithAlias                  = FlagAddress + ", ad"
-	FlagHistoryAddress                    = "history_address"
-	FlagDBEngine                          = "db_engine"
-	FlagDBAddress                         = "db_address"
-	FlagDBPort                            = "db_port"
-	FlagHistoryAddressWithAlias           = FlagHistoryAddress + ", had"
-	FlagNamespaceID                       = "namespace_id"
-	FlagNamespace                         = "namespace"
-	FlagNamespaceWithAlias                = FlagNamespace + ", ns"
-	FlagShardID                           = "shard_id"
-	FlagShardIDWithAlias                  = FlagShardID + ", sid"
-	FlagWorkflowID                        = "workflow_id"
-	FlagWorkflowIDWithAlias               = FlagWorkflowID + ", wid, w"
-	FlagRunID                             = "run_id"
-	FlagTreeID                            = "tree_id"
-	FlagBranchID                          = "branch_id"
-	FlagNumberOfShards                    = "number_of_shards"
-	FlagRunIDWithAlias                    = FlagRunID + ", rid, r"
-	FlagTargetCluster                     = "target_cluster"
-	FlagMinEventID                        = "min_event_id"
-	FlagMaxEventID                        = "max_event_id"
-	FlagStartEventVersion                 = "start_event_version"
-	FlagTaskQueue                         = "taskqueue"
-	FlagTaskQueueWithAlias                = FlagTaskQueue + ", tq"
-	FlagTaskQueueType                     = "taskqueuetype"
-	FlagTaskQueueTypeWithAlias            = FlagTaskQueueType + ", tqt"
-	FlagWorkflowIDReusePolicy             = "workflowidreusepolicy"
-	FlagWorkflowIDReusePolicyAlias        = FlagWorkflowIDReusePolicy + ", wrp"
-	FlagCronSchedule                      = "cron"
-	FlagWorkflowType                      = "workflow_type"
-	FlagWorkflowTypeWithAlias             = FlagWorkflowType + ", wt"
-	FlagWorkflowStatus                    = "status"
-	FlagWorkflowStatusWithAlias           = FlagWorkflowStatus + ", s"
-	FlagExecutionTimeout                  = "execution_timeout"
-	FlagExecutionTimeoutWithAlias         = FlagExecutionTimeout + ", et"
-	FlagDecisionTimeout                   = "decision_timeout"
-	FlagDecisionTimeoutWithAlias          = FlagDecisionTimeout + ", dt"
-	FlagContextTimeout                    = "context_timeout"
-	FlagContextTimeoutWithAlias           = FlagContextTimeout + ", ct"
-	FlagInput                             = "input"
-	FlagInputWithAlias                    = FlagInput + ", i"
-	FlagInputFile                         = "input_file"
-	FlagInputFileWithAlias                = FlagInputFile + ", if"
-	FlagExcludeFile                       = "exclude_file"
-	FlagInputSeparator                    = "input_separator"
-	FlagParallism                         = "input_parallism"
-	FlagSkipCurrentOpen                   = "skip_current_open"
-	FlagSkipBaseIsNotCurrent              = "skip_base_is_not_current"
-	FlagDryRun                            = "dry_run"
-	FlagNonDeterministicOnly              = "only_non_deterministic"
-	FlagInputTopic                        = "input_topic"
-	FlagInputTopicWithAlias               = FlagInputTopic + ", it"
-	FlagHostFile                          = "host_file"
-	FlagCluster                           = "cluster"
-	FlagInputCluster                      = "input_cluster"
-	FlagStartOffset                       = "start_offset"
-	FlagTopic                             = "topic"
-	FlagGroup                             = "group"
-	FlagResult                            = "result"
-	FlagIdentity                          = "identity"
-	FlagDetail                            = "detail"
-	FlagReason                            = "reason"
-	FlagReasonWithAlias                   = FlagReason + ", re"
-	FlagOpen                              = "open"
-	FlagOpenWithAlias                     = FlagOpen + ", op"
-	FlagMore                              = "more"
-	FlagMoreWithAlias                     = FlagMore + ", m"
-	FlagAll                               = "all"
-	FlagAllWithAlias                      = FlagAll + ", a"
-	FlagPageSize                          = "pagesize"
-	FlagPageSizeWithAlias                 = FlagPageSize + ", ps"
-	FlagEarliestTime                      = "earliest_time"
-	FlagEarliestTimeWithAlias             = FlagEarliestTime + ", et"
-	FlagLatestTime                        = "latest_time"
-	FlagLatestTimeWithAlias               = FlagLatestTime + ", lt"
-	FlagPrintEventVersion                 = "print_event_version"
-	FlagPrintEventVersionWithAlias        = FlagPrintEventVersion + ", pev"
-	FlagPrintFullyDetail                  = "print_full"
-	FlagPrintFullyDetailWithAlias         = FlagPrintFullyDetail + ", pf"
-	FlagPrintRawTime                      = "print_raw_time"
-	FlagPrintRawTimeWithAlias             = FlagPrintRawTime + ", prt"
-	FlagPrintRaw                          = "print_raw"
-	FlagPrintRawWithAlias                 = FlagPrintRaw + ", praw"
-	FlagPrintDateTime                     = "print_datetime"
-	FlagPrintDateTimeWithAlias            = FlagPrintDateTime + ", pdt"
-	FlagPrintMemo                         = "print_memo"
-	FlagPrintMemoWithAlias                = FlagPrintMemo + ", pme"
-	FlagPrintSearchAttr                   = "print_search_attr"
-	FlagPrintSearchAttrWithAlias          = FlagPrintSearchAttr + ", psa"
-	FlagPrintJSON                         = "print_json"
-	FlagPrintJSONWithAlias                = FlagPrintJSON + ", pjson"
-	FlagDescription                       = "description"
-	FlagDescriptionWithAlias              = FlagDescription + ", desc"
-	FlagOwnerEmail                        = "owner_email"
-	FlagOwnerEmailWithAlias               = FlagOwnerEmail + ", oe"
-	FlagRetentionDays                     = "retention"
-	FlagRetentionDaysWithAlias            = FlagRetentionDays + ", rd"
-	FlagHistoryArchivalStatus             = "history_archival_status"
-	FlagHistoryArchivalStatusWithAlias    = FlagHistoryArchivalStatus + ", has"
-	FlagHistoryArchivalURI                = "history_uri"
-	FlagHistoryArchivalURIWithAlias       = FlagHistoryArchivalURI + ", huri"
-	FlagHeartbeatedWithin                 = "heartbeated_within"
-	FlagVisibilityArchivalStatus          = "visibility_archival_status"
-	FlagVisibilityArchivalStatusWithAlias = FlagVisibilityArchivalStatus + ", vas"
-	FlagVisibilityArchivalURI             = "visibility_uri"
-	FlagVisibilityArchivalURIWithAlias    = FlagVisibilityArchivalURI + ", vuri"
-	FlagName                              = "name"
-	FlagNameWithAlias                     = FlagName + ", n"
-	FlagOutputFilename                    = "output_filename"
-	FlagOutputFilenameWithAlias           = FlagOutputFilename + ", of"
-	FlagOutputFormat                      = "output"
-	FlagQueryType                         = "query_type"
-	FlagQueryTypeWithAlias                = FlagQueryType + ", qt"
-	FlagQueryRejectCondition              = "query_reject_condition"
-	FlagQueryRejectConditionWithAlias     = FlagQueryRejectCondition + ", qrc"
-	FlagShowDetail                        = "show_detail"
-	FlagShowDetailWithAlias               = FlagShowDetail + ", sd"
-	FlagActiveClusterName                 = "active_cluster"
-	FlagActiveClusterNameWithAlias        = FlagActiveClusterName + ", ac"
-	FlagClusters                          = "clusters"
-	FlagClustersWithAlias                 = FlagClusters + ", cl"
-	FlagClusterMembershipRole             = "role"
-	FlagIsGlobalNamespace                 = "global_namespace"
-	FlagIsGlobalNamespaceWithAlias        = FlagIsGlobalNamespace + ", gd"
-	FlagNamespaceData                     = "namespace_data"
-	FlagNamespaceDataWithAlias            = FlagNamespaceData + ", dmd"
-	FlagEventID                           = "event_id"
-	FlagEventIDWithAlias                  = FlagEventID + ", eid"
-	FlagActivityID                        = "activity_id"
-	FlagActivityIDWithAlias               = FlagActivityID + ", aid"
-	FlagMaxFieldLength                    = "max_field_length"
-	FlagMaxFieldLengthWithAlias           = FlagMaxFieldLength + ", maxl"
-	FlagSecurityToken                     = "security_token"
-	FlagSecurityTokenWithAlias            = FlagSecurityToken + ", st"
-	FlagSkipErrorMode                     = "skip_errors"
-	FlagSkipErrorModeWithAlias            = FlagSkipErrorMode + ", serr"
-	FlagHeadersMode                       = "headers"
-	FlagHeadersModeWithAlias              = FlagHeadersMode + ", he"
-	FlagMessageType                       = "message_type"
-	FlagMessageTypeWithAlias              = FlagMessageType + ", mt"
-	FlagURL                               = "url"
-	FlagIndex                             = "index"
-	FlagBatchSize                         = "batch_size"
-	FlagBatchSizeWithAlias                = FlagBatchSize + ", bs"
-	FlagMemoKey                           = "memo_key"
-	FlagMemo                              = "memo"
-	FlagMemoFile                          = "memo_file"
-	FlagSearchAttributesKey               = "search_attr_key"
-	FlagSearchAttributesVal               = "search_attr_value"
-	FlagSearchAttributesType              = "search_attr_type"
-	FlagAddBadBinary                      = "add_bad_binary"
-	FlagRemoveBadBinary                   = "remove_bad_binary"
-	FlagResetType                         = "reset_type"
-	FlagResetPointsOnly                   = "reset_points_only"
-	FlagResetBadBinaryChecksum            = "reset_bad_binary_checksum"
-	FlagListQuery                         = "query"
-	FlagListQueryWithAlias                = FlagListQuery + ", q"
-	FlagBatchType                         = "batch_type"
-	FlagBatchTypeWithAlias                = FlagBatchType + ", bt"
-	FlagSignalName                        = "signal_name"
-	FlagSignalNameWithAlias               = FlagSignalName + ", sig"
-	FlagTaskID                            = "task_id"
-	FlagTaskType                          = "task_type"
-	FlagMinReadLevel                      = "min_read_level"
-	FlagMaxReadLevel                      = "max_read_level"
-	FlagTaskVisibilityTimestamp           = "task_timestamp"
-	FlagMinVisibilityTimestamp            = "min_visibility_ts"
-	FlagMaxVisibilityTimestamp            = "max_visibility_ts"
-	FlagStartingRPS                       = "starting_rps"
-	FlagRPS                               = "rps"
-	FlagRPSScaleUpSeconds                 = "rps_scale_up_seconds"
-	FlagJobID                             = "job_id"
-	FlagJobIDWithAlias                    = FlagJobID + ", jid"
-	FlagYes                               = "yes"
-	FlagServiceConfigDir                  = "service_config_dir"
-	FlagServiceConfigDirWithAlias         = FlagServiceConfigDir + ", scd"
-	FlagServiceEnv                        = "service_env"
-	FlagServiceEnvWithAlias               = FlagServiceEnv + ", se"
-	FlagServiceZone                       = "service_zone"
-	FlagServiceZoneWithAlias              = FlagServiceZone + ", sz"
-	FlagEnableTLS                         = "tls"
-	FlagTLSCertPath                       = "tls_cert_path"
-	FlagTLSKeyPath                        = "tls_key_path"
-	FlagTLSCaPath                         = "tls_ca_path"
-	FlagTLSEnableHostVerification         = "tls_enable_host_verification"
-	FlagDLQType                           = "dlq_type"
-	FlagDLQTypeWithAlias                  = FlagDLQType + ", dt"
-	FlagMaxMessageCount                   = "max_message_count"
-	FlagMaxMessageCountWithAlias          = FlagMaxMessageCount + ", mmc"
-	FlagLastMessageID                     = "last_message_id"
-	FlagLastMessageIDWithAlias            = FlagLastMessageID + ", lm"
-	FlagConcurrency                       = "concurrency"
-	FlagReportRate                        = "report_rate"
-	FlagLowerShardBound                   = "lower_shard_bound"
-	FlagUpperShardBound                   = "upper_shard_bound"
-	FlagInputDirectory                    = "input_directory"
-	FlagAutoConfirm                       = "auto_confirm"
+	FlagUsername                         = "username"
+	FlagPassword                         = "password"
+	FlagKeyspace                         = "keyspace"
+	FlagAddress                          = "address"
+	FlagAddressWithAlias                 = FlagAddress + ", ad"
+	FlagHistoryAddress                   = "history_address"
+	FlagDBEngine                         = "db_engine"
+	FlagDBAddress                        = "db_address"
+	FlagDBPort                           = "db_port"
+	FlagHistoryAddressWithAlias          = FlagHistoryAddress + ", had"
+	FlagNamespaceID                      = "namespace_id"
+	FlagNamespace                        = "namespace"
+	FlagNamespaceWithAlias               = FlagNamespace + ", ns"
+	FlagShardID                          = "shard_id"
+	FlagShardIDWithAlias                 = FlagShardID + ", sid"
+	FlagWorkflowID                       = "workflow_id"
+	FlagWorkflowIDWithAlias              = FlagWorkflowID + ", wid, w"
+	FlagRunID                            = "run_id"
+	FlagTreeID                           = "tree_id"
+	FlagBranchID                         = "branch_id"
+	FlagNumberOfShards                   = "number_of_shards"
+	FlagRunIDWithAlias                   = FlagRunID + ", rid, r"
+	FlagTargetCluster                    = "target_cluster"
+	FlagMinEventID                       = "min_event_id"
+	FlagMaxEventID                       = "max_event_id"
+	FlagStartEventVersion                = "start_event_version"
+	FlagTaskQueue                        = "taskqueue"
+	FlagTaskQueueWithAlias               = FlagTaskQueue + ", tq"
+	FlagTaskQueueType                    = "taskqueuetype"
+	FlagTaskQueueTypeWithAlias           = FlagTaskQueueType + ", tqt"
+	FlagWorkflowIDReusePolicy            = "workflowidreusepolicy"
+	FlagWorkflowIDReusePolicyAlias       = FlagWorkflowIDReusePolicy + ", wrp"
+	FlagCronSchedule                     = "cron"
+	FlagWorkflowType                     = "workflow_type"
+	FlagWorkflowTypeWithAlias            = FlagWorkflowType + ", wt"
+	FlagWorkflowStatus                   = "status"
+	FlagWorkflowStatusWithAlias          = FlagWorkflowStatus + ", s"
+	FlagExecutionTimeout                 = "execution_timeout"
+	FlagExecutionTimeoutWithAlias        = FlagExecutionTimeout + ", et"
+	FlagDecisionTimeout                  = "decision_timeout"
+	FlagDecisionTimeoutWithAlias         = FlagDecisionTimeout + ", dt"
+	FlagContextTimeout                   = "context_timeout"
+	FlagContextTimeoutWithAlias          = FlagContextTimeout + ", ct"
+	FlagInput                            = "input"
+	FlagInputWithAlias                   = FlagInput + ", i"
+	FlagInputFile                        = "input_file"
+	FlagInputFileWithAlias               = FlagInputFile + ", if"
+	FlagExcludeFile                      = "exclude_file"
+	FlagInputSeparator                   = "input_separator"
+	FlagParallism                        = "input_parallism"
+	FlagSkipCurrentOpen                  = "skip_current_open"
+	FlagSkipBaseIsNotCurrent             = "skip_base_is_not_current"
+	FlagDryRun                           = "dry_run"
+	FlagNonDeterministicOnly             = "only_non_deterministic"
+	FlagInputTopic                       = "input_topic"
+	FlagInputTopicWithAlias              = FlagInputTopic + ", it"
+	FlagHostFile                         = "host_file"
+	FlagCluster                          = "cluster"
+	FlagInputCluster                     = "input_cluster"
+	FlagStartOffset                      = "start_offset"
+	FlagTopic                            = "topic"
+	FlagGroup                            = "group"
+	FlagResult                           = "result"
+	FlagIdentity                         = "identity"
+	FlagDetail                           = "detail"
+	FlagReason                           = "reason"
+	FlagReasonWithAlias                  = FlagReason + ", re"
+	FlagOpen                             = "open"
+	FlagOpenWithAlias                    = FlagOpen + ", op"
+	FlagMore                             = "more"
+	FlagMoreWithAlias                    = FlagMore + ", m"
+	FlagAll                              = "all"
+	FlagAllWithAlias                     = FlagAll + ", a"
+	FlagPageSize                         = "pagesize"
+	FlagPageSizeWithAlias                = FlagPageSize + ", ps"
+	FlagEarliestTime                     = "earliest_time"
+	FlagEarliestTimeWithAlias            = FlagEarliestTime + ", et"
+	FlagLatestTime                       = "latest_time"
+	FlagLatestTimeWithAlias              = FlagLatestTime + ", lt"
+	FlagPrintEventVersion                = "print_event_version"
+	FlagPrintEventVersionWithAlias       = FlagPrintEventVersion + ", pev"
+	FlagPrintFullyDetail                 = "print_full"
+	FlagPrintFullyDetailWithAlias        = FlagPrintFullyDetail + ", pf"
+	FlagPrintRawTime                     = "print_raw_time"
+	FlagPrintRawTimeWithAlias            = FlagPrintRawTime + ", prt"
+	FlagPrintRaw                         = "print_raw"
+	FlagPrintRawWithAlias                = FlagPrintRaw + ", praw"
+	FlagPrintDateTime                    = "print_datetime"
+	FlagPrintDateTimeWithAlias           = FlagPrintDateTime + ", pdt"
+	FlagPrintMemo                        = "print_memo"
+	FlagPrintMemoWithAlias               = FlagPrintMemo + ", pme"
+	FlagPrintSearchAttr                  = "print_search_attr"
+	FlagPrintSearchAttrWithAlias         = FlagPrintSearchAttr + ", psa"
+	FlagPrintJSON                        = "print_json"
+	FlagPrintJSONWithAlias               = FlagPrintJSON + ", pjson"
+	FlagDescription                      = "description"
+	FlagDescriptionWithAlias             = FlagDescription + ", desc"
+	FlagOwnerEmail                       = "owner_email"
+	FlagOwnerEmailWithAlias              = FlagOwnerEmail + ", oe"
+	FlagRetentionDays                    = "retention"
+	FlagRetentionDaysWithAlias           = FlagRetentionDays + ", rd"
+	FlagHistoryArchivalState             = "history_archival_state"
+	FlagHistoryArchivalStateWithAlias    = FlagHistoryArchivalState + ", has"
+	FlagHistoryArchivalURI               = "history_uri"
+	FlagHistoryArchivalURIWithAlias      = FlagHistoryArchivalURI + ", huri"
+	FlagHeartbeatedWithin                = "heartbeated_within"
+	FlagVisibilityArchivalState          = "visibility_archival_state"
+	FlagVisibilityArchivalStateWithAlias = FlagVisibilityArchivalState + ", vas"
+	FlagVisibilityArchivalURI            = "visibility_uri"
+	FlagVisibilityArchivalURIWithAlias   = FlagVisibilityArchivalURI + ", vuri"
+	FlagName                             = "name"
+	FlagNameWithAlias                    = FlagName + ", n"
+	FlagOutputFilename                   = "output_filename"
+	FlagOutputFilenameWithAlias          = FlagOutputFilename + ", of"
+	FlagOutputFormat                     = "output"
+	FlagQueryType                        = "query_type"
+	FlagQueryTypeWithAlias               = FlagQueryType + ", qt"
+	FlagQueryRejectCondition             = "query_reject_condition"
+	FlagQueryRejectConditionWithAlias    = FlagQueryRejectCondition + ", qrc"
+	FlagShowDetail                       = "show_detail"
+	FlagShowDetailWithAlias              = FlagShowDetail + ", sd"
+	FlagActiveClusterName                = "active_cluster"
+	FlagActiveClusterNameWithAlias       = FlagActiveClusterName + ", ac"
+	FlagClusters                         = "clusters"
+	FlagClustersWithAlias                = FlagClusters + ", cl"
+	FlagClusterMembershipRole            = "role"
+	FlagIsGlobalNamespace                = "global_namespace"
+	FlagIsGlobalNamespaceWithAlias       = FlagIsGlobalNamespace + ", gd"
+	FlagNamespaceData                    = "namespace_data"
+	FlagNamespaceDataWithAlias           = FlagNamespaceData + ", dmd"
+	FlagEventID                          = "event_id"
+	FlagEventIDWithAlias                 = FlagEventID + ", eid"
+	FlagActivityID                       = "activity_id"
+	FlagActivityIDWithAlias              = FlagActivityID + ", aid"
+	FlagMaxFieldLength                   = "max_field_length"
+	FlagMaxFieldLengthWithAlias          = FlagMaxFieldLength + ", maxl"
+	FlagSecurityToken                    = "security_token"
+	FlagSecurityTokenWithAlias           = FlagSecurityToken + ", st"
+	FlagSkipErrorMode                    = "skip_errors"
+	FlagSkipErrorModeWithAlias           = FlagSkipErrorMode + ", serr"
+	FlagHeadersMode                      = "headers"
+	FlagHeadersModeWithAlias             = FlagHeadersMode + ", he"
+	FlagMessageType                      = "message_type"
+	FlagMessageTypeWithAlias             = FlagMessageType + ", mt"
+	FlagURL                              = "url"
+	FlagIndex                            = "index"
+	FlagBatchSize                        = "batch_size"
+	FlagBatchSizeWithAlias               = FlagBatchSize + ", bs"
+	FlagMemoKey                          = "memo_key"
+	FlagMemo                             = "memo"
+	FlagMemoFile                         = "memo_file"
+	FlagSearchAttributesKey              = "search_attr_key"
+	FlagSearchAttributesVal              = "search_attr_value"
+	FlagSearchAttributesType             = "search_attr_type"
+	FlagAddBadBinary                     = "add_bad_binary"
+	FlagRemoveBadBinary                  = "remove_bad_binary"
+	FlagResetType                        = "reset_type"
+	FlagResetPointsOnly                  = "reset_points_only"
+	FlagResetBadBinaryChecksum           = "reset_bad_binary_checksum"
+	FlagListQuery                        = "query"
+	FlagListQueryWithAlias               = FlagListQuery + ", q"
+	FlagBatchType                        = "batch_type"
+	FlagBatchTypeWithAlias               = FlagBatchType + ", bt"
+	FlagSignalName                       = "signal_name"
+	FlagSignalNameWithAlias              = FlagSignalName + ", sig"
+	FlagTaskID                           = "task_id"
+	FlagTaskType                         = "task_type"
+	FlagMinReadLevel                     = "min_read_level"
+	FlagMaxReadLevel                     = "max_read_level"
+	FlagTaskVisibilityTimestamp          = "task_timestamp"
+	FlagMinVisibilityTimestamp           = "min_visibility_ts"
+	FlagMaxVisibilityTimestamp           = "max_visibility_ts"
+	FlagStartingRPS                      = "starting_rps"
+	FlagRPS                              = "rps"
+	FlagRPSScaleUpSeconds                = "rps_scale_up_seconds"
+	FlagJobID                            = "job_id"
+	FlagJobIDWithAlias                   = FlagJobID + ", jid"
+	FlagYes                              = "yes"
+	FlagServiceConfigDir                 = "service_config_dir"
+	FlagServiceConfigDirWithAlias        = FlagServiceConfigDir + ", scd"
+	FlagServiceEnv                       = "service_env"
+	FlagServiceEnvWithAlias              = FlagServiceEnv + ", se"
+	FlagServiceZone                      = "service_zone"
+	FlagServiceZoneWithAlias             = FlagServiceZone + ", sz"
+	FlagEnableTLS                        = "tls"
+	FlagTLSCertPath                      = "tls_cert_path"
+	FlagTLSKeyPath                       = "tls_key_path"
+	FlagTLSCaPath                        = "tls_ca_path"
+	FlagTLSEnableHostVerification        = "tls_enable_host_verification"
+	FlagDLQType                          = "dlq_type"
+	FlagDLQTypeWithAlias                 = FlagDLQType + ", dt"
+	FlagMaxMessageCount                  = "max_message_count"
+	FlagMaxMessageCountWithAlias         = FlagMaxMessageCount + ", mmc"
+	FlagLastMessageID                    = "last_message_id"
+	FlagLastMessageIDWithAlias           = FlagLastMessageID + ", lm"
+	FlagConcurrency                      = "concurrency"
+	FlagReportRate                       = "report_rate"
+	FlagLowerShardBound                  = "lower_shard_bound"
+	FlagUpperShardBound                  = "upper_shard_bound"
+	FlagInputDirectory                   = "input_directory"
+	FlagAutoConfirm                      = "auto_confirm"
 )
 
 var flagsForExecution = []cli.Flag{
@@ -449,7 +449,7 @@ func getFlagsForListAll() []cli.Flag {
 		},
 		cli.StringFlag{
 			Name:  FlagWorkflowStatusWithAlias,
-			Usage: "Closed workflow status [completed, failed, canceled, terminated, continuedasnew, timedout]",
+			Usage: "Workflow status [completed, failed, canceled, terminated, continuedasnew, timedout]",
 		},
 		cli.StringFlag{
 			Name: FlagListQueryWithAlias,
diff --git a/tools/cli/namespaceCommands.go b/tools/cli/namespaceCommands.go
index 1e42f9e8c5d..b1a1f295e4c 100644
--- a/tools/cli/namespaceCommands.go
+++ b/tools/cli/namespaceCommands.go
@@ -129,19 +129,19 @@ func (d *namespaceCLIImpl) RegisterNamespace(c *cli.Context) {
 	}
 
 	request := &workflowservice.RegisterNamespaceRequest{
-		Name:                                   namespace,
-		Description:                            description,
-		OwnerEmail:                             ownerEmail,
-		Data:                                   namespaceData,
-		WorkflowExecutionRetentionPeriodInDays: int32(retentionDays),
-		Clusters:                               clusters,
-		ActiveClusterName:                      activeClusterName,
-		SecurityToken:                          securityToken,
-		HistoryArchivalStatus:                  archivalStatus(c, FlagHistoryArchivalStatus),
-		HistoryArchivalUri:                     c.String(FlagHistoryArchivalURI),
-		VisibilityArchivalStatus:               archivalStatus(c, FlagVisibilityArchivalStatus),
-		VisibilityArchivalUri:                  c.String(FlagVisibilityArchivalURI),
-		IsGlobalNamespace:                      isGlobalNamespace,
+		Name:                                 namespace,
+		Description:                          description,
+		OwnerEmail:                           ownerEmail,
+		Data:                                 namespaceData,
+		WorkflowExecutionRetentionPeriodDays: int32(retentionDays),
+		Clusters:                             clusters,
+		ActiveClusterName:                    activeClusterName,
+		SecurityToken:                        securityToken,
+		HistoryArchivalState:                 archivalState(c, FlagHistoryArchivalState),
+		HistoryArchivalUri:                   c.String(FlagHistoryArchivalURI),
+		VisibilityArchivalState:              archivalState(c, FlagVisibilityArchivalState),
+		VisibilityArchivalUri:                c.String(FlagVisibilityArchivalURI),
+		IsGlobalNamespace:                    isGlobalNamespace,
 	}
 
 	ctx, cancel := newContext(c)
@@ -255,9 +255,9 @@ func (d *namespaceCLIImpl) UpdateNamespace(c *cli.Context) {
 		updateConfig := &namespacepb.NamespaceConfig{
 			WorkflowExecutionRetentionPeriodInDays: retentionDays,
 			EmitMetric:                             &types.BoolValue{Value: emitMetric},
-			HistoryArchivalStatus:                  archivalStatus(c, FlagHistoryArchivalStatus),
+			HistoryArchivalState:                   archivalState(c, FlagHistoryArchivalState),
 			HistoryArchivalUri:                     c.String(FlagHistoryArchivalURI),
-			VisibilityArchivalStatus:               archivalStatus(c, FlagVisibilityArchivalStatus),
+			VisibilityArchivalState:                archivalState(c, FlagVisibilityArchivalState),
 			VisibilityArchivalUri:                  c.String(FlagVisibilityArchivalURI),
 			BadBinaries:                            binBinaries,
 		}
@@ -312,27 +312,27 @@ func (d *namespaceCLIImpl) DescribeNamespace(c *cli.Context) {
 }
 
 func printNamespace(resp *workflowservice.DescribeNamespaceResponse) {
-	var formatStr = "Name: %v\nId: %v\nDescription: %v\nOwnerEmail: %v\nNamespaceData: %#v\nStatus: %v\nRetentionInDays: %v\n" +
-		"EmitMetrics: %v\nActiveClusterName: %v\nClusters: %v\nHistoryArchivalStatus: %v\n"
+	var formatStr = "Name: %v\nId: %v\nDescription: %v\nOwnerEmail: %v\nNamespaceData: %#v\nState: %v\nRetentionInDays: %v\n" +
+		"EmitMetrics: %v\nActiveClusterName: %v\nClusters: %v\nHistoryArchivalState: %v\n"
 	descValues := []interface{}{
 		resp.NamespaceInfo.GetName(),
 		resp.NamespaceInfo.GetId(),
 		resp.NamespaceInfo.GetDescription(),
 		resp.NamespaceInfo.GetOwnerEmail(),
 		resp.NamespaceInfo.Data,
-		resp.NamespaceInfo.GetStatus(),
+		resp.NamespaceInfo.GetState(),
 		resp.Config.GetWorkflowExecutionRetentionPeriodInDays(),
 		resp.Config.GetEmitMetric().GetValue(),
 		resp.ReplicationConfig.GetActiveClusterName(),
 		clustersToString(resp.ReplicationConfig.Clusters),
-		resp.Config.GetHistoryArchivalStatus().String(),
+		resp.Config.GetHistoryArchivalState().String(),
 	}
 	if resp.Config.GetHistoryArchivalUri() != "" {
 		formatStr = formatStr + "HistoryArchivalURI: %v\n"
 		descValues = append(descValues, resp.Config.GetHistoryArchivalUri())
 	}
-	formatStr = formatStr + "VisibilityArchivalStatus: %v\n"
-	descValues = append(descValues, resp.Config.GetVisibilityArchivalStatus().String())
+	formatStr = formatStr + "VisibilityArchivalState: %v\n"
+	descValues = append(descValues, resp.Config.GetVisibilityArchivalState().String())
 	if resp.Config.GetVisibilityArchivalUri() != "" {
 		formatStr = formatStr + "VisibilityArchivalURI: %v\n"
 		descValues = append(descValues, resp.Config.GetVisibilityArchivalUri())
@@ -449,16 +449,16 @@ func clustersToString(clusters []*replicationpb.ClusterReplicationConfig) string
 	return res
 }
 
-func archivalStatus(c *cli.Context, statusFlagName string) enumspb.ArchivalStatus {
-	if c.IsSet(statusFlagName) {
-		switch c.String(statusFlagName) {
+func archivalState(c *cli.Context, stateFlagName string) enumspb.ArchivalState {
+	if c.IsSet(stateFlagName) {
+		switch c.String(stateFlagName) {
 		case "disabled":
-			return enumspb.ARCHIVAL_STATUS_DISABLED
+			return enumspb.ARCHIVAL_STATE_DISABLED
 		case "enabled":
-			return enumspb.ARCHIVAL_STATUS_ENABLED
+			return enumspb.ARCHIVAL_STATE_ENABLED
 		default:
-			ErrorAndExit(fmt.Sprintf("Option %s format is invalid.", statusFlagName), errors.New("invalid status, valid values are \"disabled\" and \"enabled\""))
+			ErrorAndExit(fmt.Sprintf("Option %s format is invalid.", stateFlagName), errors.New("invalid state, valid values are \"disabled\" and \"enabled\""))
 		}
 	}
-	return enumspb.ARCHIVAL_STATUS_UNSPECIFIED
+	return enumspb.ARCHIVAL_STATE_UNSPECIFIED
 }
diff --git a/tools/cli/namespaceUtils.go b/tools/cli/namespaceUtils.go
index 14e3eef2658..fc905398bff 100644
--- a/tools/cli/namespaceUtils.go
+++ b/tools/cli/namespaceUtils.go
@@ -89,16 +89,16 @@ var (
 			Usage: "Optional token for security check",
 		},
 		cli.StringFlag{
-			Name:  FlagHistoryArchivalStatusWithAlias,
-			Usage: "Flag to set history archival status, valid values are \"disabled\" and \"enabled\"",
+			Name:  FlagHistoryArchivalStateWithAlias,
+			Usage: "Flag to set history archival state, valid values are \"disabled\" and \"enabled\"",
 		},
 		cli.StringFlag{
 			Name:  FlagHistoryArchivalURIWithAlias,
 			Usage: "Optionally specify history archival URI (cannot be changed after first time archival is enabled)",
 		},
 		cli.StringFlag{
-			Name:  FlagVisibilityArchivalStatusWithAlias,
-			Usage: "Flag to set visibility archival status, valid values are \"disabled\" and \"enabled\"",
+			Name:  FlagVisibilityArchivalStateWithAlias,
+			Usage: "Flag to set visibility archival state, valid values are \"disabled\" and \"enabled\"",
 		},
 		cli.StringFlag{
 			Name:  FlagVisibilityArchivalURIWithAlias,
@@ -139,16 +139,16 @@ var (
 			Usage: "Optional token for security check",
 		},
 		cli.StringFlag{
-			Name:  FlagHistoryArchivalStatusWithAlias,
-			Usage: "Flag to set history archival status, valid values are \"disabled\" and \"enabled\"",
+			Name:  FlagHistoryArchivalStateWithAlias,
+			Usage: "Flag to set history archival state, valid values are \"disabled\" and \"enabled\"",
 		},
 		cli.StringFlag{
 			Name:  FlagHistoryArchivalURIWithAlias,
 			Usage: "Optionally specify history archival URI (cannot be changed after first time archival is enabled)",
 		},
 		cli.StringFlag{
-			Name:  FlagVisibilityArchivalStatusWithAlias,
-			Usage: "Flag to set visibility archival status, valid values are \"disabled\" and \"enabled\"",
+			Name:  FlagVisibilityArchivalStateWithAlias,
+			Usage: "Flag to set visibility archival state, valid values are \"disabled\" and \"enabled\"",
 		},
 		cli.StringFlag{
 			Name:  FlagVisibilityArchivalURIWithAlias,
@@ -332,9 +332,9 @@ func initializeArchivalMetadata(
 
 	return archiver.NewArchivalMetadata(
 		dynamicConfig,
-		serviceConfig.Archival.History.Status,
+		serviceConfig.Archival.History.State,
 		serviceConfig.Archival.History.EnableRead,
-		serviceConfig.Archival.Visibility.Status,
+		serviceConfig.Archival.Visibility.State,
 		serviceConfig.Archival.Visibility.EnableRead,
 		&serviceConfig.NamespaceDefaults.Archival,
 	)
diff --git a/tools/cli/workflowCommands.go b/tools/cli/workflowCommands.go
index dbcaf1c0cbe..3576f027380 100644
--- a/tools/cli/workflowCommands.go
+++ b/tools/cli/workflowCommands.go
@@ -1099,7 +1099,7 @@ func printRunStatus(event *historypb.HistoryEvent) {
 		fmt.Printf("  Failure: %s\n", event.GetWorkflowExecutionFailedEventAttributes().GetFailure().String())
 	case enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIMED_OUT:
 		fmt.Printf("  Status: %s\n", colorRed("TIMEOUT"))
-		fmt.Printf("  Retry status: %s\n", event.GetWorkflowExecutionTimedOutEventAttributes().GetRetryStatus())
+		fmt.Printf("  Retry status: %s\n", event.GetWorkflowExecutionTimedOutEventAttributes().GetRetryState())
 	case enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_CANCELED:
 		fmt.Printf("  Status: %s\n", colorRed("CANCELED"))
 		var details string