diff --git a/ring/go/arbiter.pb.go b/ring/go/arbiter.pb.go
index 4be814c9..7f4187e1 100644
--- a/ring/go/arbiter.pb.go
+++ b/ring/go/arbiter.pb.go
@@ -24,7 +24,7 @@ const (
 
 type ShardStatusRequest struct {
 	state         protoimpl.MessageState  `protogen:"open.v1"`
-	Status        map[uint32]*ShardStatus `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // shard_id -> status
+	Status        map[uint32]*ShardStatus `protobuf:"bytes,1,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // don_id -> status
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
diff --git a/ring/go/consensus.pb.go b/ring/go/consensus.pb.go
index 7fa6273b..8d262a4d 100644
--- a/ring/go/consensus.pb.go
+++ b/ring/go/consensus.pb.go
@@ -24,7 +24,7 @@ const (
 
 type Observation struct {
 	state         protoimpl.MessageState  `protogen:"open.v1"`
-	ShardStatus   map[uint32]*ShardStatus `protobuf:"bytes,1,rep,name=shard_status,json=shardStatus,proto3" json:"shard_status,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // shard_id -> status
+	ShardStatus   map[uint32]*ShardStatus `protobuf:"bytes,1,rep,name=shard_status,json=shardStatus,proto3" json:"shard_status,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // don_id -> status
 	WorkflowIds   []string                `protobuf:"bytes,2,rep,name=workflow_ids,json=workflowIds,proto3" json:"workflow_ids,omitempty"`
 	Now           *timestamppb.Timestamp  `protobuf:"bytes,3,opt,name=now,proto3" json:"now,omitempty"`
 	WantShards    uint32                  `protobuf:"varint,4,opt,name=want_shards,json=wantShards,proto3" json:"want_shards,omitempty"` // from ArbiterScaler.Status()
@@ -92,7 +92,7 @@ func (x *Observation) GetWantShards() uint32 {
 
 type WorkflowRoute struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Shard         uint32                 `protobuf:"varint,1,opt,name=shard,proto3" json:"shard,omitempty"`
+	DonId         uint32                 `protobuf:"varint,1,opt,name=don_id,json=donId,proto3" json:"don_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -127,9 +127,9 @@ func (*WorkflowRoute) Descriptor() ([]byte, []int) {
 	return file_consensus_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *WorkflowRoute) GetShard() uint32 {
+func (x *WorkflowRoute) GetDonId() uint32 {
 	if x != nil {
-		return x.Shard
+		return x.DonId
 	}
 	return 0
 }
@@ -349,9 +349,9 @@ const file_consensus_proto_rawDesc = "" +
 	"wantShards\x1aQ\n" +
 	"\x10ShardStatusEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\rR\x03key\x12'\n" +
-	"\x05value\x18\x02 \x01(\v2\x11.ring.ShardStatusR\x05value:\x028\x01\"%\n" +
-	"\rWorkflowRoute\x12\x14\n" +
-	"\x05shard\x18\x01 \x01(\rR\x05shard\"\xa3\x01\n" +
+	"\x05value\x18\x02 \x01(\v2\x11.ring.ShardStatusR\x05value:\x028\x01\"&\n" +
+	"\rWorkflowRoute\x12\x15\n" +
+	"\x06don_id\x18\x01 \x01(\rR\x05donId\"\xa3\x01\n" +
 	"\n" +
 	"Transition\x12\x1f\n" +
 	"\vwant_shards\x18\x01 \x01(\rR\n" +
diff --git a/ring/go/shard_orchestrator.pb.go b/ring/go/shard_orchestrator.pb.go
index 8ac061ae..ee114c7b 100644
--- a/ring/go/shard_orchestrator.pb.go
+++ b/ring/go/shard_orchestrator.pb.go
@@ -67,8 +67,8 @@ func (x *GetWorkflowShardMappingRequest) GetWorkflowIds() []string {
 
 type WorkflowMappingState struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	OldShardId    uint32                 `protobuf:"varint,1,opt,name=old_shard_id,json=oldShardId,proto3" json:"old_shard_id,omitempty"`
-	NewShardId    uint32                 `protobuf:"varint,2,opt,name=new_shard_id,json=newShardId,proto3" json:"new_shard_id,omitempty"`
+	OldDonId      uint32                 `protobuf:"varint,1,opt,name=old_don_id,json=oldDonId,proto3" json:"old_don_id,omitempty"`
+	NewDonId      uint32                 `protobuf:"varint,2,opt,name=new_don_id,json=newDonId,proto3" json:"new_don_id,omitempty"`
 	InTransition  bool                   `protobuf:"varint,3,opt,name=in_transition,json=inTransition,proto3" json:"in_transition,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
@@ -104,16 +104,16 @@ func (*WorkflowMappingState) Descriptor() ([]byte, []int) {
 	return file_shard_orchestrator_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *WorkflowMappingState) GetOldShardId() uint32 {
+func (x *WorkflowMappingState) GetOldDonId() uint32 {
 	if x != nil {
-		return x.OldShardId
+		return x.OldDonId
 	}
 	return 0
 }
 
-func (x *WorkflowMappingState) GetNewShardId() uint32 {
+func (x *WorkflowMappingState) GetNewDonId() uint32 {
 	if x != nil {
-		return x.NewShardId
+		return x.NewDonId
 	}
 	return 0
 }
@@ -203,7 +203,7 @@ func (x *GetWorkflowShardMappingResponse) GetRoutingSteady() bool {
 
 type ReportWorkflowTriggerRegistrationRequest struct {
 	state                protoimpl.MessageState `protogen:"open.v1"`
-	SourceShardId        uint32                 `protobuf:"varint,1,opt,name=source_shard_id,json=sourceShardId,proto3" json:"source_shard_id,omitempty"`
+	SourceDonId          uint32                 `protobuf:"varint,1,opt,name=source_don_id,json=sourceDonId,proto3" json:"source_don_id,omitempty"`
 	RegisteredWorkflows  map[string]uint32      `protobuf:"bytes,2,rep,name=registered_workflows,json=registeredWorkflows,proto3" json:"registered_workflows,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
 	TotalActiveWorkflows uint32                 `protobuf:"varint,3,opt,name=total_active_workflows,json=totalActiveWorkflows,proto3" json:"total_active_workflows,omitempty"`
 	unknownFields        protoimpl.UnknownFields
@@ -240,9 +240,9 @@ func (*ReportWorkflowTriggerRegistrationRequest) Descriptor() ([]byte, []int) {
 	return file_shard_orchestrator_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *ReportWorkflowTriggerRegistrationRequest) GetSourceShardId() uint32 {
+func (x *ReportWorkflowTriggerRegistrationRequest) GetSourceDonId() uint32 {
 	if x != nil {
-		return x.SourceShardId
+		return x.SourceDonId
 	}
 	return 0
 }
@@ -311,12 +311,12 @@ const file_shard_orchestrator_proto_rawDesc = "" +
 	"\n" +
 	"\x18shard_orchestrator.proto\x12\x04ring\"C\n" +
 	"\x1eGetWorkflowShardMappingRequest\x12!\n" +
-	"\fworkflow_ids\x18\x01 \x03(\tR\vworkflowIds\"\x7f\n" +
-	"\x14WorkflowMappingState\x12 \n" +
-	"\fold_shard_id\x18\x01 \x01(\rR\n" +
-	"oldShardId\x12 \n" +
-	"\fnew_shard_id\x18\x02 \x01(\rR\n" +
-	"newShardId\x12#\n" +
+	"\fworkflow_ids\x18\x01 \x03(\tR\vworkflowIds\"w\n" +
+	"\x14WorkflowMappingState\x12\x1c\n" +
+	"\n" +
+	"old_don_id\x18\x01 \x01(\rR\boldDonId\x12\x1c\n" +
+	"\n" +
+	"new_don_id\x18\x02 \x01(\rR\bnewDonId\x12#\n" +
 	"\rin_transition\x18\x03 \x01(\bR\finTransition\"\xe8\x03\n" +
 	"\x1fGetWorkflowShardMappingResponse\x12O\n" +
 	"\bmappings\x18\x01 \x03(\v23.ring.GetWorkflowShardMappingResponse.MappingsEntryR\bmappings\x12_\n" +
@@ -329,9 +329,9 @@ const file_shard_orchestrator_proto_rawDesc = "" +
 	"\x05value\x18\x02 \x01(\rR\x05value:\x028\x01\x1a\\\n" +
 	"\x12MappingStatesEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x120\n" +
-	"\x05value\x18\x02 \x01(\v2\x1a.ring.WorkflowMappingStateR\x05value:\x028\x01\"\xcc\x02\n" +
-	"(ReportWorkflowTriggerRegistrationRequest\x12&\n" +
-	"\x0fsource_shard_id\x18\x01 \x01(\rR\rsourceShardId\x12z\n" +
+	"\x05value\x18\x02 \x01(\v2\x1a.ring.WorkflowMappingStateR\x05value:\x028\x01\"\xc8\x02\n" +
+	"(ReportWorkflowTriggerRegistrationRequest\x12\"\n" +
+	"\rsource_don_id\x18\x01 \x01(\rR\vsourceDonId\x12z\n" +
 	"\x14registered_workflows\x18\x02 \x03(\v2G.ring.ReportWorkflowTriggerRegistrationRequest.RegisteredWorkflowsEntryR\x13registeredWorkflows\x124\n" +
 	"\x16total_active_workflows\x18\x03 \x01(\rR\x14totalActiveWorkflows\x1aF\n" +
 	"\x18RegisteredWorkflowsEntry\x12\x10\n" +
diff --git a/ring/go/sharding.pb.go b/ring/go/sharding.pb.go
index 8d9b9337..a0e49d8f 100644
--- a/ring/go/sharding.pb.go
+++ b/ring/go/sharding.pb.go
@@ -79,7 +79,7 @@ type ExecutionStatusUpdate struct {
 	TriggerEventId string                 `protobuf:"bytes,2,opt,name=trigger_event_id,json=triggerEventId,proto3" json:"trigger_event_id,omitempty"`
 	TriggerIndex   uint32                 `protobuf:"varint,3,opt,name=trigger_index,json=triggerIndex,proto3" json:"trigger_index,omitempty"`
 	Status         ExecutionStatus        `protobuf:"varint,4,opt,name=status,proto3,enum=ring.ExecutionStatus" json:"status,omitempty"`
-	PrimaryShardId uint32                 `protobuf:"varint,5,opt,name=primary_shard_id,json=primaryShardId,proto3" json:"primary_shard_id,omitempty"`
+	PrimaryDonId   uint32                 `protobuf:"varint,5,opt,name=primary_don_id,json=primaryDonId,proto3" json:"primary_don_id,omitempty"`
 	ExecutionId    string                 `protobuf:"bytes,6,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
 	unknownFields  protoimpl.UnknownFields
 	sizeCache      protoimpl.SizeCache
@@ -143,9 +143,9 @@ func (x *ExecutionStatusUpdate) GetStatus() ExecutionStatus {
 	return ExecutionStatus_EXECUTION_STATUS_UNSPECIFIED
 }
 
-func (x *ExecutionStatusUpdate) GetPrimaryShardId() uint32 {
+func (x *ExecutionStatusUpdate) GetPrimaryDonId() uint32 {
 	if x != nil {
-		return x.PrimaryShardId
+		return x.PrimaryDonId
 	}
 	return 0
 }
@@ -159,7 +159,7 @@ func (x *ExecutionStatusUpdate) GetExecutionId() string {
 
 type ShardHeartbeat struct {
 	state                protoimpl.MessageState `protogen:"open.v1"`
-	PrimaryShardId       uint32                 `protobuf:"varint,1,opt,name=primary_shard_id,json=primaryShardId,proto3" json:"primary_shard_id,omitempty"`
+	PrimaryDonId         uint32                 `protobuf:"varint,1,opt,name=primary_don_id,json=primaryDonId,proto3" json:"primary_don_id,omitempty"`
 	Timestamp            int64                  `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	ActiveExecutionCount uint32                 `protobuf:"varint,3,opt,name=active_execution_count,json=activeExecutionCount,proto3" json:"active_execution_count,omitempty"`
 	unknownFields        protoimpl.UnknownFields
@@ -196,9 +196,9 @@ func (*ShardHeartbeat) Descriptor() ([]byte, []int) {
 	return file_sharding_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ShardHeartbeat) GetPrimaryShardId() uint32 {
+func (x *ShardHeartbeat) GetPrimaryDonId() uint32 {
 	if x != nil {
-		return x.PrimaryShardId
+		return x.PrimaryDonId
 	}
 	return 0
 }
@@ -221,17 +221,17 @@ var File_sharding_proto protoreflect.FileDescriptor
 
 const file_sharding_proto_rawDesc = "" +
 	"\n" +
-	"\x0esharding.proto\x12\x04ring\"\x83\x02\n" +
+	"\x0esharding.proto\x12\x04ring\"\xff\x01\n" +
 	"\x15ExecutionStatusUpdate\x12\x1f\n" +
 	"\vworkflow_id\x18\x01 \x01(\tR\n" +
 	"workflowId\x12(\n" +
 	"\x10trigger_event_id\x18\x02 \x01(\tR\x0etriggerEventId\x12#\n" +
 	"\rtrigger_index\x18\x03 \x01(\rR\ftriggerIndex\x12-\n" +
-	"\x06status\x18\x04 \x01(\x0e2\x15.ring.ExecutionStatusR\x06status\x12(\n" +
-	"\x10primary_shard_id\x18\x05 \x01(\rR\x0eprimaryShardId\x12!\n" +
-	"\fexecution_id\x18\x06 \x01(\tR\vexecutionId\"\x8e\x01\n" +
-	"\x0eShardHeartbeat\x12(\n" +
-	"\x10primary_shard_id\x18\x01 \x01(\rR\x0eprimaryShardId\x12\x1c\n" +
+	"\x06status\x18\x04 \x01(\x0e2\x15.ring.ExecutionStatusR\x06status\x12$\n" +
+	"\x0eprimary_don_id\x18\x05 \x01(\rR\fprimaryDonId\x12!\n" +
+	"\fexecution_id\x18\x06 \x01(\tR\vexecutionId\"\x8a\x01\n" +
+	"\x0eShardHeartbeat\x12$\n" +
+	"\x0eprimary_don_id\x18\x01 \x01(\rR\fprimaryDonId\x12\x1c\n" +
 	"\ttimestamp\x18\x02 \x01(\x03R\ttimestamp\x124\n" +
 	"\x16active_execution_count\x18\x03 \x01(\rR\x14activeExecutionCount*\x95\x01\n" +
 	"\x0fExecutionStatus\x12 \n" +
diff --git a/ring/pb/arbiter.proto b/ring/pb/arbiter.proto
index e7b89aee..ff34c0ba 100644
--- a/ring/pb/arbiter.proto
+++ b/ring/pb/arbiter.proto
@@ -8,7 +8,7 @@ import "shared.proto";
 option go_package = "github.com/smartcontractkit/chainlink-protos/ring/go;ring";
 
 message ShardStatusRequest {
-  map<uint32, ShardStatus> status = 1; // shard_id -> status
+  map<uint32, ShardStatus> status = 1; // don_id -> status
 }
 
 message ArbiterResponse {
diff --git a/ring/pb/consensus.proto b/ring/pb/consensus.proto
index 3afe12b6..7c12d796 100644
--- a/ring/pb/consensus.proto
+++ b/ring/pb/consensus.proto
@@ -8,14 +8,14 @@ import "shared.proto";
 option go_package = "github.com/smartcontractkit/chainlink-protos/ring/go;ring";
 
 message Observation {
-  map<uint32, ShardStatus> shard_status = 1; // shard_id -> status
+  map<uint32, ShardStatus> shard_status = 1; // don_id -> status
   repeated string workflow_ids = 2;
   google.protobuf.Timestamp now = 3;
   uint32 want_shards = 4; // from ArbiterScaler.Status()
 }
 
 message WorkflowRoute {
-  uint32 shard = 1;
+  uint32 don_id = 1;
 }
 
 message Transition {
diff --git a/ring/pb/shard_orchestrator.proto b/ring/pb/shard_orchestrator.proto
index 6a3a5200..211db03a 100644
--- a/ring/pb/shard_orchestrator.proto
+++ b/ring/pb/shard_orchestrator.proto
@@ -9,8 +9,8 @@ message GetWorkflowShardMappingRequest {
 }
 
 message WorkflowMappingState {
-  uint32 old_shard_id = 1;
-  uint32 new_shard_id = 2;
+  uint32 old_don_id = 1;
+  uint32 new_don_id = 2;
   bool in_transition = 3;
 }
 
@@ -23,7 +23,7 @@ message GetWorkflowShardMappingResponse {
 }
 
 message ReportWorkflowTriggerRegistrationRequest {
-  uint32 source_shard_id = 1;
+  uint32 source_don_id = 1;
   map<string, uint32> registered_workflows = 2;
   uint32 total_active_workflows = 3;
 }
diff --git a/ring/pb/sharding.proto b/ring/pb/sharding.proto
index 9dd5514e..5d7fd3eb 100644
--- a/ring/pb/sharding.proto
+++ b/ring/pb/sharding.proto
@@ -9,7 +9,7 @@ message ExecutionStatusUpdate {
   string trigger_event_id = 2;
   uint32 trigger_index = 3;
   ExecutionStatus status = 4;
-  uint32 primary_shard_id = 5;
+  uint32 primary_don_id = 5;
   string execution_id = 6;
 }
 
@@ -21,7 +21,7 @@ enum ExecutionStatus {
 }
 
 message ShardHeartbeat {
-  uint32 primary_shard_id = 1;
+  uint32 primary_don_id = 1;
   int64 timestamp = 2;
   uint32 active_execution_count = 3;
 }