From 7a0ec04e684e8e6c0ccb994da216f50e066d2d4f Mon Sep 17 00:00:00 2001
From: macrogreg <macrogreg@live.com>
Date: Thu, 31 Mar 2022 16:16:04 -0700
Subject: [PATCH 1/2] Simplify .NET namespaces and make required file name
 changes

---
 .../{message.proto => command-message.proto}  | 12 +++---
 .../{message.proto => common-message.proto}   |  4 +-
 ...nd_type.proto => enums-command_type.proto} |  2 +-
 .../v1/{common.proto => enums-common.proto}   |  2 +-
 ...vent_type.proto => enums-event_type.proto} |  2 +-
 ...d_cause.proto => enums-failed_cause.proto} |  2 +-
 ...{namespace.proto => enums-namespace.proto} |  2 +-
 .../v1/{query.proto => enums-query.proto}     |  2 +-
 .../v1/{reset.proto => enums-reset.proto}     |  2 +-
 ...ask_queue.proto => enums-task_queue.proto} |  2 +-
 .../{workflow.proto => enums-workflow.proto}  |  2 +-
 ...ssage.proto => errordetails-message.proto} |  6 +--
 .../{message.proto => failure-message.proto}  |  6 +--
 .../{message.proto => filter-message.proto}   |  4 +-
 .../{message.proto => history-message.proto}  | 16 ++++----
 ...{message.proto => namespace-message.proto} |  4 +-
 ...=> operatorservice-request_response.proto} |  4 +-
 ...ce.proto => operatorservice-service.proto} |  4 +-
 .../v1/{message.proto => query-message.proto} |  8 ++--
 ...essage.proto => replication-message.proto} |  4 +-
 ...{message.proto => taskqueue-message.proto} |  4 +-
 .../{message.proto => version-message.proto}  |  4 +-
 .../{message.proto => workflow-message.proto} | 10 ++---
 ...=> workflowservice-request_response.proto} | 40 +++++++++----------
 ...ce.proto => workflowservice-service.proto} |  4 +-
 25 files changed, 76 insertions(+), 76 deletions(-)
 rename temporal/api/command/v1/{message.proto => command-message.proto} (97%)
 rename temporal/api/common/v1/{message.proto => common-message.proto} (97%)
 rename temporal/api/enums/v1/{command_type.proto => enums-command_type.proto} (97%)
 rename temporal/api/enums/v1/{common.proto => enums-common.proto} (96%)
 rename temporal/api/enums/v1/{event_type.proto => enums-event_type.proto} (99%)
 rename temporal/api/enums/v1/{failed_cause.proto => enums-failed_cause.proto} (98%)
 rename temporal/api/enums/v1/{namespace.proto => enums-namespace.proto} (96%)
 rename temporal/api/enums/v1/{query.proto => enums-query.proto} (97%)
 rename temporal/api/enums/v1/{reset.proto => enums-reset.proto} (96%)
 rename temporal/api/enums/v1/{task_queue.proto => enums-task_queue.proto} (97%)
 rename temporal/api/enums/v1/{workflow.proto => enums-workflow.proto} (98%)
 rename temporal/api/errordetails/v1/{message.proto => errordetails-message.proto} (94%)
 rename temporal/api/failure/v1/{message.proto => failure-message.proto} (95%)
 rename temporal/api/filter/v1/{message.proto => filter-message.proto} (94%)
 rename temporal/api/history/v1/{message.proto => history-message.proto} (98%)
 rename temporal/api/namespace/v1/{message.proto => namespace-message.proto} (96%)
 rename temporal/api/operatorservice/v1/{request_response.proto => operatorservice-request_response.proto} (96%)
 rename temporal/api/operatorservice/v1/{service.proto => operatorservice-service.proto} (95%)
 rename temporal/api/query/v1/{message.proto => query-message.proto} (91%)
 rename temporal/api/replication/v1/{message.proto => replication-message.proto} (93%)
 rename temporal/api/taskqueue/v1/{message.proto => taskqueue-message.proto} (96%)
 rename temporal/api/version/v1/{message.proto => version-message.proto} (95%)
 rename temporal/api/workflow/v1/{message.proto => workflow-message.proto} (94%)
 rename temporal/api/workflowservice/v1/{request_response.proto => workflowservice-request_response.proto} (96%)
 rename temporal/api/workflowservice/v1/{service.proto => workflowservice-service.proto} (99%)

diff --git a/temporal/api/command/v1/message.proto b/temporal/api/command/v1/command-message.proto
similarity index 97%
rename from temporal/api/command/v1/message.proto
rename to temporal/api/command/v1/command-message.proto
index 5bce9e4d..6f3f6d13 100644
--- a/temporal/api/command/v1/message.proto
+++ b/temporal/api/command/v1/command-message.proto
@@ -29,17 +29,17 @@ option java_package = "io.temporal.api.command.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Command::V1";
-option csharp_namespace = "Temporal.Api.Command.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/enums/v1/command_type.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/enums/v1/enums-command_type.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/failure/v1/failure-message.proto";
+import "temporal/api/taskqueue/v1/taskqueue-message.proto";
 
 message ScheduleActivityTaskCommandAttributes {
     string activity_id = 1;
diff --git a/temporal/api/common/v1/message.proto b/temporal/api/common/v1/common-message.proto
similarity index 97%
rename from temporal/api/common/v1/message.proto
rename to temporal/api/common/v1/common-message.proto
index 5364a758..f461267c 100644
--- a/temporal/api/common/v1/message.proto
+++ b/temporal/api/common/v1/common-message.proto
@@ -29,13 +29,13 @@ option java_package = "io.temporal.api.common.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Common::V1";
-option csharp_namespace = "Temporal.Api.Common.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/enums/v1/enums-common.proto";
 
 message DataBlob {
     temporal.api.enums.v1.EncodingType encoding_type = 1;
diff --git a/temporal/api/enums/v1/command_type.proto b/temporal/api/enums/v1/enums-command_type.proto
similarity index 97%
rename from temporal/api/enums/v1/command_type.proto
rename to temporal/api/enums/v1/enums-command_type.proto
index dfe6e1ee..c8516da0 100644
--- a/temporal/api/enums/v1/command_type.proto
+++ b/temporal/api/enums/v1/enums-command_type.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "CommandTypeProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Whenever this list of command types is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering.
 enum CommandType {
diff --git a/temporal/api/enums/v1/common.proto b/temporal/api/enums/v1/enums-common.proto
similarity index 96%
rename from temporal/api/enums/v1/common.proto
rename to temporal/api/enums/v1/enums-common.proto
index d0d90bbb..86465e49 100644
--- a/temporal/api/enums/v1/common.proto
+++ b/temporal/api/enums/v1/enums-common.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum EncodingType {
     ENCODING_TYPE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/event_type.proto b/temporal/api/enums/v1/enums-event_type.proto
similarity index 99%
rename from temporal/api/enums/v1/event_type.proto
rename to temporal/api/enums/v1/enums-event_type.proto
index e7f95368..8225f4eb 100644
--- a/temporal/api/enums/v1/event_type.proto
+++ b/temporal/api/enums/v1/enums-event_type.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "EventTypeProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Whenever this list of events is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering
 enum EventType {
diff --git a/temporal/api/enums/v1/failed_cause.proto b/temporal/api/enums/v1/enums-failed_cause.proto
similarity index 98%
rename from temporal/api/enums/v1/failed_cause.proto
rename to temporal/api/enums/v1/enums-failed_cause.proto
index 2e22f5ac..f5918272 100644
--- a/temporal/api/enums/v1/failed_cause.proto
+++ b/temporal/api/enums/v1/enums-failed_cause.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "FailedCauseProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Workflow tasks can fail for various reasons. Note that some of these reasons can only originate
 // from the server, and some of them can only originate from the SDK/worker.
diff --git a/temporal/api/enums/v1/namespace.proto b/temporal/api/enums/v1/enums-namespace.proto
similarity index 96%
rename from temporal/api/enums/v1/namespace.proto
rename to temporal/api/enums/v1/enums-namespace.proto
index 9af74144..a3a800af 100644
--- a/temporal/api/enums/v1/namespace.proto
+++ b/temporal/api/enums/v1/enums-namespace.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "NamespaceProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum NamespaceState {
     NAMESPACE_STATE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/query.proto b/temporal/api/enums/v1/enums-query.proto
similarity index 97%
rename from temporal/api/enums/v1/query.proto
rename to temporal/api/enums/v1/enums-query.proto
index efcebb43..ec3a7fb9 100644
--- a/temporal/api/enums/v1/query.proto
+++ b/temporal/api/enums/v1/enums-query.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "QueryProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum QueryResultType {
     QUERY_RESULT_TYPE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/reset.proto b/temporal/api/enums/v1/enums-reset.proto
similarity index 96%
rename from temporal/api/enums/v1/reset.proto
rename to temporal/api/enums/v1/enums-reset.proto
index 6b7c637c..e1f50a58 100644
--- a/temporal/api/enums/v1/reset.proto
+++ b/temporal/api/enums/v1/enums-reset.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ResetProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // TODO: What is this?
 enum ResetReapplyType {
diff --git a/temporal/api/enums/v1/task_queue.proto b/temporal/api/enums/v1/enums-task_queue.proto
similarity index 97%
rename from temporal/api/enums/v1/task_queue.proto
rename to temporal/api/enums/v1/enums-task_queue.proto
index 54f6d479..7c604e0b 100644
--- a/temporal/api/enums/v1/task_queue.proto
+++ b/temporal/api/enums/v1/enums-task_queue.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "TaskQueueProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum TaskQueueKind {
     TASK_QUEUE_KIND_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/workflow.proto b/temporal/api/enums/v1/enums-workflow.proto
similarity index 98%
rename from temporal/api/enums/v1/workflow.proto
rename to temporal/api/enums/v1/enums-workflow.proto
index 142ca117..6ced6f12 100644
--- a/temporal/api/enums/v1/workflow.proto
+++ b/temporal/api/enums/v1/enums-workflow.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "WorkflowProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Defines how new runs of a workflow with a particular ID may or may not be allowed. Note that
 // it is *never* valid to have two actively running instances of the same workflow id.
diff --git a/temporal/api/errordetails/v1/message.proto b/temporal/api/errordetails/v1/errordetails-message.proto
similarity index 94%
rename from temporal/api/errordetails/v1/message.proto
rename to temporal/api/errordetails/v1/errordetails-message.proto
index 421fa36e..6ff926f3 100644
--- a/temporal/api/errordetails/v1/message.proto
+++ b/temporal/api/errordetails/v1/errordetails-message.proto
@@ -32,10 +32,10 @@ option java_package = "io.temporal.api.errordetails.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::ErrorDetails::V1";
-option csharp_namespace = "Temporal.Api.ErrorDetails.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel.ErrorDetails";
 
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/enums/v1/enums-failed_cause.proto";
 
 message NotFoundFailure {
     string current_cluster = 1;
diff --git a/temporal/api/failure/v1/message.proto b/temporal/api/failure/v1/failure-message.proto
similarity index 95%
rename from temporal/api/failure/v1/message.proto
rename to temporal/api/failure/v1/failure-message.proto
index 79eeaec8..958ccab7 100644
--- a/temporal/api/failure/v1/message.proto
+++ b/temporal/api/failure/v1/failure-message.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.failure.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Failure::V1";
-option csharp_namespace = "Temporal.Api.Failure.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/enums/v1/workflow.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
 
 message ApplicationFailureInfo {
     string type = 1;
diff --git a/temporal/api/filter/v1/message.proto b/temporal/api/filter/v1/filter-message.proto
similarity index 94%
rename from temporal/api/filter/v1/message.proto
rename to temporal/api/filter/v1/filter-message.proto
index c00f80f6..17153f03 100644
--- a/temporal/api/filter/v1/message.proto
+++ b/temporal/api/filter/v1/filter-message.proto
@@ -29,13 +29,13 @@ option java_package = "io.temporal.api.filter.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Filter::V1";
-option csharp_namespace = "Temporal.Api.Filter.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
 
 message WorkflowExecutionFilter {
     string workflow_id = 1;
diff --git a/temporal/api/history/v1/message.proto b/temporal/api/history/v1/history-message.proto
similarity index 98%
rename from temporal/api/history/v1/message.proto
rename to temporal/api/history/v1/history-message.proto
index 2cf44dd2..a1fc3ca8 100644
--- a/temporal/api/history/v1/message.proto
+++ b/temporal/api/history/v1/history-message.proto
@@ -29,20 +29,20 @@ option java_package = "io.temporal.api.history.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::History::V1";
-option csharp_namespace = "Temporal.Api.History.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/event_type.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/workflow/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/enums/v1/enums-event_type.proto";
+import "temporal/api/enums/v1/enums-failed_cause.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/failure/v1/failure-message.proto";
+import "temporal/api/workflow/v1/workflow-message.proto";
+import "temporal/api/taskqueue/v1/taskqueue-message.proto";
 
 // Always the first event in workflow history
 message WorkflowExecutionStartedEventAttributes {
diff --git a/temporal/api/namespace/v1/message.proto b/temporal/api/namespace/v1/namespace-message.proto
similarity index 96%
rename from temporal/api/namespace/v1/message.proto
rename to temporal/api/namespace/v1/namespace-message.proto
index 1df585fe..c7a1c5cd 100644
--- a/temporal/api/namespace/v1/message.proto
+++ b/temporal/api/namespace/v1/namespace-message.proto
@@ -29,14 +29,14 @@ option java_package = "io.temporal.api.namespace.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Namespace::V1";
-option csharp_namespace = "Temporal.Api.Namespace.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/namespace.proto";
+import "temporal/api/enums/v1/enums-namespace.proto";
 
 
 message NamespaceInfo {
diff --git a/temporal/api/operatorservice/v1/request_response.proto b/temporal/api/operatorservice/v1/operatorservice-request_response.proto
similarity index 96%
rename from temporal/api/operatorservice/v1/request_response.proto
rename to temporal/api/operatorservice/v1/operatorservice-request_response.proto
index 7fa551fb..2c069f6e 100644
--- a/temporal/api/operatorservice/v1/request_response.proto
+++ b/temporal/api/operatorservice/v1/operatorservice-request_response.proto
@@ -29,9 +29,9 @@ option java_package = "io.temporal.api.operatorservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::OperatorService::V1";
-option csharp_namespace = "Temporal.Api.OperatorService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/enums/v1/enums-common.proto";
 
 // (-- Search Attribute --)
 
diff --git a/temporal/api/operatorservice/v1/service.proto b/temporal/api/operatorservice/v1/operatorservice-service.proto
similarity index 95%
rename from temporal/api/operatorservice/v1/service.proto
rename to temporal/api/operatorservice/v1/operatorservice-service.proto
index cec40e02..92ca4551 100644
--- a/temporal/api/operatorservice/v1/service.proto
+++ b/temporal/api/operatorservice/v1/operatorservice-service.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.operatorservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ServiceProto";
 option ruby_package = "Temporal::Api::OperatorService::V1";
-option csharp_namespace = "Temporal.Api.OperatorService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.OperatorService";
 
 
-import "temporal/api/operatorservice/v1/request_response.proto";
+import "temporal/api/operatorservice/v1/operatorservice-request_response.proto";
 
 // OperatorService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to perform administrative functions like registering a search attribute or a namespace.
diff --git a/temporal/api/query/v1/message.proto b/temporal/api/query/v1/query-message.proto
similarity index 91%
rename from temporal/api/query/v1/message.proto
rename to temporal/api/query/v1/query-message.proto
index 61f79423..63f319b7 100644
--- a/temporal/api/query/v1/message.proto
+++ b/temporal/api/query/v1/query-message.proto
@@ -29,11 +29,11 @@ option java_package = "io.temporal.api.query.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Query::V1";
-option csharp_namespace = "Temporal.Api.Query.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/query.proto";
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
+import "temporal/api/enums/v1/enums-query.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/common/v1/common-message.proto";
 
 // See https://docs.temporal.io/docs/concepts/queries/
 message WorkflowQuery {
diff --git a/temporal/api/replication/v1/message.proto b/temporal/api/replication/v1/replication-message.proto
similarity index 93%
rename from temporal/api/replication/v1/message.proto
rename to temporal/api/replication/v1/replication-message.proto
index ada92ed4..2ed2159d 100644
--- a/temporal/api/replication/v1/message.proto
+++ b/temporal/api/replication/v1/replication-message.proto
@@ -29,9 +29,9 @@ option java_package = "io.temporal.api.replication.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Replication::V1";
-option csharp_namespace = "Temporal.Api.Replication.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/namespace.proto";
+import "temporal/api/enums/v1/enums-namespace.proto";
 
 message ClusterReplicationConfig {
     string cluster_name = 1;
diff --git a/temporal/api/taskqueue/v1/message.proto b/temporal/api/taskqueue/v1/taskqueue-message.proto
similarity index 96%
rename from temporal/api/taskqueue/v1/message.proto
rename to temporal/api/taskqueue/v1/taskqueue-message.proto
index af25292e..8fc40083 100644
--- a/temporal/api/taskqueue/v1/message.proto
+++ b/temporal/api/taskqueue/v1/taskqueue-message.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.taskqueue.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::TaskQueue::V1";
-option csharp_namespace = "Temporal.Api.TaskQueue.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
@@ -37,7 +37,7 @@ import "google/protobuf/wrappers.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/task_queue.proto";
+import "temporal/api/enums/v1/enums-task_queue.proto";
 
 // See https://docs.temporal.io/docs/concepts/task-queues/
 message TaskQueue {
diff --git a/temporal/api/version/v1/message.proto b/temporal/api/version/v1/version-message.proto
similarity index 95%
rename from temporal/api/version/v1/message.proto
rename to temporal/api/version/v1/version-message.proto
index a089713f..02ca9394 100644
--- a/temporal/api/version/v1/message.proto
+++ b/temporal/api/version/v1/version-message.proto
@@ -29,11 +29,11 @@ option java_package = "io.temporal.api.version.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Version::V1";
-option csharp_namespace = "Temporal.Api.Version.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/timestamp.proto";
 import "dependencies/gogoproto/gogo.proto";
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/enums/v1/enums-common.proto";
 
 // ReleaseInfo contains information about specific version of temporal.
 message ReleaseInfo {
diff --git a/temporal/api/workflow/v1/message.proto b/temporal/api/workflow/v1/workflow-message.proto
similarity index 94%
rename from temporal/api/workflow/v1/message.proto
rename to temporal/api/workflow/v1/workflow-message.proto
index 53d92fec..931c37a1 100644
--- a/temporal/api/workflow/v1/message.proto
+++ b/temporal/api/workflow/v1/workflow-message.proto
@@ -29,17 +29,17 @@ option java_package = "io.temporal.api.workflow.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Workflow::V1";
-option csharp_namespace = "Temporal.Api.Workflow.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/failure/v1/failure-message.proto";
+import "temporal/api/taskqueue/v1/taskqueue-message.proto";
 
 message WorkflowExecutionInfo {
     temporal.api.common.v1.WorkflowExecution execution = 1;
diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/workflowservice/v1/workflowservice-request_response.proto
similarity index 96%
rename from temporal/api/workflowservice/v1/request_response.proto
rename to temporal/api/workflowservice/v1/workflowservice-request_response.proto
index 1d550f1e..f67acfba 100644
--- a/temporal/api/workflowservice/v1/request_response.proto
+++ b/temporal/api/workflowservice/v1/workflowservice-request_response.proto
@@ -29,26 +29,26 @@ option java_package = "io.temporal.api.workflowservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::WorkflowService::V1";
-option csharp_namespace = "Temporal.Api.WorkflowService.V1";
-
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/enums/v1/namespace.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
-import "temporal/api/enums/v1/common.proto";
-import "temporal/api/enums/v1/query.proto";
-import "temporal/api/enums/v1/reset.proto";
-import "temporal/api/enums/v1/task_queue.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/history/v1/message.proto";
-import "temporal/api/workflow/v1/message.proto";
-import "temporal/api/command/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/filter/v1/message.proto";
-import "temporal/api/namespace/v1/message.proto";
-import "temporal/api/query/v1/message.proto";
-import "temporal/api/replication/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
-import "temporal/api/version/v1/message.proto";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
+
+import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/enums/v1/enums-namespace.proto";
+import "temporal/api/enums/v1/enums-failed_cause.proto";
+import "temporal/api/enums/v1/enums-common.proto";
+import "temporal/api/enums/v1/enums-query.proto";
+import "temporal/api/enums/v1/enums-reset.proto";
+import "temporal/api/enums/v1/enums-task_queue.proto";
+import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/history/v1/history-message.proto";
+import "temporal/api/workflow/v1/workflow-message.proto";
+import "temporal/api/command/v1/command-message.proto";
+import "temporal/api/failure/v1/failure-message.proto";
+import "temporal/api/filter/v1/filter-message.proto";
+import "temporal/api/namespace/v1/namespace-message.proto";
+import "temporal/api/query/v1/query-message.proto";
+import "temporal/api/replication/v1/replication-message.proto";
+import "temporal/api/taskqueue/v1/taskqueue-message.proto";
+import "temporal/api/version/v1/version-message.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/temporal/api/workflowservice/v1/service.proto b/temporal/api/workflowservice/v1/workflowservice-service.proto
similarity index 99%
rename from temporal/api/workflowservice/v1/service.proto
rename to temporal/api/workflowservice/v1/workflowservice-service.proto
index 9fe8f937..e6cfafef 100644
--- a/temporal/api/workflowservice/v1/service.proto
+++ b/temporal/api/workflowservice/v1/workflowservice-service.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.workflowservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ServiceProto";
 option ruby_package = "Temporal::Api::WorkflowService::V1";
-option csharp_namespace = "Temporal.Api.WorkflowService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.WorkflowService";
 
 
-import "temporal/api/workflowservice/v1/request_response.proto";
+import "temporal/api/workflowservice/v1/workflowservice-request_response.proto";
 
 // WorkflowService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to create and interact with workflows and activities.

From 4d299d69ed2dcd95f4f7cb903a6990b9bbbdc05f Mon Sep 17 00:00:00 2001
From: macrogreg <macrogreg@live.com>
Date: Wed, 13 Apr 2022 12:41:21 -0700
Subject: [PATCH 2/2] Change `-` in file names to `_`.

---
 ...nd-message.proto => command_message.proto} | 10 +++---
 ...mon-message.proto => common_message.proto} |  2 +-
 ...nd_type.proto => enums_command_type.proto} |  0
 ...{enums-common.proto => enums_common.proto} |  0
 ...vent_type.proto => enums_event_type.proto} |  0
 ...d_cause.proto => enums_failed_cause.proto} |  0
 ...-namespace.proto => enums_namespace.proto} |  0
 .../{enums-query.proto => enums_query.proto}  |  0
 .../{enums-reset.proto => enums_reset.proto}  |  0
 ...ask_queue.proto => enums_task_queue.proto} |  0
 ...ms-workflow.proto => enums_workflow.proto} |  0
 ...ssage.proto => errordetails_message.proto} |  4 +--
 ...re-message.proto => failure_message.proto} |  4 +--
 ...ter-message.proto => filter_message.proto} |  2 +-
 ...ry-message.proto => history_message.proto} | 14 ++++----
 ...-message.proto => namespace_message.proto} |  2 +-
 ...=> operatorservice_request_response.proto} |  2 +-
 ...ce.proto => operatorservice_service.proto} |  2 +-
 ...uery-message.proto => query_message.proto} |  6 ++--
 ...essage.proto => replication_message.proto} |  2 +-
 ...-message.proto => taskqueue_message.proto} |  2 +-
 ...on-message.proto => version_message.proto} |  2 +-
 ...w-message.proto => workflow_message.proto} |  8 ++---
 ...=> workflowservice_request_response.proto} | 36 +++++++++----------
 ...ce.proto => workflowservice_service.proto} |  2 +-
 25 files changed, 50 insertions(+), 50 deletions(-)
 rename temporal/api/command/v1/{command-message.proto => command_message.proto} (97%)
 rename temporal/api/common/v1/{common-message.proto => common_message.proto} (98%)
 rename temporal/api/enums/v1/{enums-command_type.proto => enums_command_type.proto} (100%)
 rename temporal/api/enums/v1/{enums-common.proto => enums_common.proto} (100%)
 rename temporal/api/enums/v1/{enums-event_type.proto => enums_event_type.proto} (100%)
 rename temporal/api/enums/v1/{enums-failed_cause.proto => enums_failed_cause.proto} (100%)
 rename temporal/api/enums/v1/{enums-namespace.proto => enums_namespace.proto} (100%)
 rename temporal/api/enums/v1/{enums-query.proto => enums_query.proto} (100%)
 rename temporal/api/enums/v1/{enums-reset.proto => enums_reset.proto} (100%)
 rename temporal/api/enums/v1/{enums-task_queue.proto => enums_task_queue.proto} (100%)
 rename temporal/api/enums/v1/{enums-workflow.proto => enums_workflow.proto} (100%)
 rename temporal/api/errordetails/v1/{errordetails-message.proto => errordetails_message.proto} (96%)
 rename temporal/api/failure/v1/{failure-message.proto => failure_message.proto} (96%)
 rename temporal/api/filter/v1/{filter-message.proto => filter_message.proto} (97%)
 rename temporal/api/history/v1/{history-message.proto => history_message.proto} (98%)
 rename temporal/api/namespace/v1/{namespace-message.proto => namespace_message.proto} (98%)
 rename temporal/api/operatorservice/v1/{operatorservice-request_response.proto => operatorservice_request_response.proto} (98%)
 rename temporal/api/operatorservice/v1/{operatorservice-service.proto => operatorservice_service.proto} (98%)
 rename temporal/api/query/v1/{query-message.proto => query_message.proto} (93%)
 rename temporal/api/replication/v1/{replication-message.proto => replication_message.proto} (97%)
 rename temporal/api/taskqueue/v1/{taskqueue-message.proto => taskqueue_message.proto} (98%)
 rename temporal/api/version/v1/{version-message.proto => version_message.proto} (97%)
 rename temporal/api/workflow/v1/{workflow-message.proto => workflow_message.proto} (95%)
 rename temporal/api/workflowservice/v1/{workflowservice-request_response.proto => workflowservice_request_response.proto} (96%)
 rename temporal/api/workflowservice/v1/{workflowservice-service.proto => workflowservice_service.proto} (99%)

diff --git a/temporal/api/command/v1/command-message.proto b/temporal/api/command/v1/command_message.proto
similarity index 97%
rename from temporal/api/command/v1/command-message.proto
rename to temporal/api/command/v1/command_message.proto
index 6f3f6d13..04caa864 100644
--- a/temporal/api/command/v1/command-message.proto
+++ b/temporal/api/command/v1/command_message.proto
@@ -35,11 +35,11 @@ import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-workflow.proto";
-import "temporal/api/enums/v1/enums-command_type.proto";
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/failure/v1/failure-message.proto";
-import "temporal/api/taskqueue/v1/taskqueue-message.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
+import "temporal/api/enums/v1/enums_command_type.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/failure/v1/failure_message.proto";
+import "temporal/api/taskqueue/v1/taskqueue_message.proto";
 
 message ScheduleActivityTaskCommandAttributes {
     string activity_id = 1;
diff --git a/temporal/api/common/v1/common-message.proto b/temporal/api/common/v1/common_message.proto
similarity index 98%
rename from temporal/api/common/v1/common-message.proto
rename to temporal/api/common/v1/common_message.proto
index f461267c..6c3fb08c 100644
--- a/temporal/api/common/v1/common-message.proto
+++ b/temporal/api/common/v1/common_message.proto
@@ -35,7 +35,7 @@ import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-common.proto";
+import "temporal/api/enums/v1/enums_common.proto";
 
 message DataBlob {
     temporal.api.enums.v1.EncodingType encoding_type = 1;
diff --git a/temporal/api/enums/v1/enums-command_type.proto b/temporal/api/enums/v1/enums_command_type.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-command_type.proto
rename to temporal/api/enums/v1/enums_command_type.proto
diff --git a/temporal/api/enums/v1/enums-common.proto b/temporal/api/enums/v1/enums_common.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-common.proto
rename to temporal/api/enums/v1/enums_common.proto
diff --git a/temporal/api/enums/v1/enums-event_type.proto b/temporal/api/enums/v1/enums_event_type.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-event_type.proto
rename to temporal/api/enums/v1/enums_event_type.proto
diff --git a/temporal/api/enums/v1/enums-failed_cause.proto b/temporal/api/enums/v1/enums_failed_cause.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-failed_cause.proto
rename to temporal/api/enums/v1/enums_failed_cause.proto
diff --git a/temporal/api/enums/v1/enums-namespace.proto b/temporal/api/enums/v1/enums_namespace.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-namespace.proto
rename to temporal/api/enums/v1/enums_namespace.proto
diff --git a/temporal/api/enums/v1/enums-query.proto b/temporal/api/enums/v1/enums_query.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-query.proto
rename to temporal/api/enums/v1/enums_query.proto
diff --git a/temporal/api/enums/v1/enums-reset.proto b/temporal/api/enums/v1/enums_reset.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-reset.proto
rename to temporal/api/enums/v1/enums_reset.proto
diff --git a/temporal/api/enums/v1/enums-task_queue.proto b/temporal/api/enums/v1/enums_task_queue.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-task_queue.proto
rename to temporal/api/enums/v1/enums_task_queue.proto
diff --git a/temporal/api/enums/v1/enums-workflow.proto b/temporal/api/enums/v1/enums_workflow.proto
similarity index 100%
rename from temporal/api/enums/v1/enums-workflow.proto
rename to temporal/api/enums/v1/enums_workflow.proto
diff --git a/temporal/api/errordetails/v1/errordetails-message.proto b/temporal/api/errordetails/v1/errordetails_message.proto
similarity index 96%
rename from temporal/api/errordetails/v1/errordetails-message.proto
rename to temporal/api/errordetails/v1/errordetails_message.proto
index 6ff926f3..e4135e54 100644
--- a/temporal/api/errordetails/v1/errordetails-message.proto
+++ b/temporal/api/errordetails/v1/errordetails_message.proto
@@ -34,8 +34,8 @@ option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::ErrorDetails::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel.ErrorDetails";
 
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/enums/v1/enums-failed_cause.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/enums/v1/enums_failed_cause.proto";
 
 message NotFoundFailure {
     string current_cluster = 1;
diff --git a/temporal/api/failure/v1/failure-message.proto b/temporal/api/failure/v1/failure_message.proto
similarity index 96%
rename from temporal/api/failure/v1/failure-message.proto
rename to temporal/api/failure/v1/failure_message.proto
index 958ccab7..3d9cef8a 100644
--- a/temporal/api/failure/v1/failure-message.proto
+++ b/temporal/api/failure/v1/failure_message.proto
@@ -31,8 +31,8 @@ option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Failure::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
 
 message ApplicationFailureInfo {
     string type = 1;
diff --git a/temporal/api/filter/v1/filter-message.proto b/temporal/api/filter/v1/filter_message.proto
similarity index 97%
rename from temporal/api/filter/v1/filter-message.proto
rename to temporal/api/filter/v1/filter_message.proto
index 17153f03..2d544bd1 100644
--- a/temporal/api/filter/v1/filter-message.proto
+++ b/temporal/api/filter/v1/filter_message.proto
@@ -35,7 +35,7 @@ import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-workflow.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
 
 message WorkflowExecutionFilter {
     string workflow_id = 1;
diff --git a/temporal/api/history/v1/history-message.proto b/temporal/api/history/v1/history_message.proto
similarity index 98%
rename from temporal/api/history/v1/history-message.proto
rename to temporal/api/history/v1/history_message.proto
index a1fc3ca8..35a6968a 100644
--- a/temporal/api/history/v1/history-message.proto
+++ b/temporal/api/history/v1/history_message.proto
@@ -36,13 +36,13 @@ import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-event_type.proto";
-import "temporal/api/enums/v1/enums-failed_cause.proto";
-import "temporal/api/enums/v1/enums-workflow.proto";
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/failure/v1/failure-message.proto";
-import "temporal/api/workflow/v1/workflow-message.proto";
-import "temporal/api/taskqueue/v1/taskqueue-message.proto";
+import "temporal/api/enums/v1/enums_event_type.proto";
+import "temporal/api/enums/v1/enums_failed_cause.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/failure/v1/failure_message.proto";
+import "temporal/api/workflow/v1/workflow_message.proto";
+import "temporal/api/taskqueue/v1/taskqueue_message.proto";
 
 // Always the first event in workflow history
 message WorkflowExecutionStartedEventAttributes {
diff --git a/temporal/api/namespace/v1/namespace-message.proto b/temporal/api/namespace/v1/namespace_message.proto
similarity index 98%
rename from temporal/api/namespace/v1/namespace-message.proto
rename to temporal/api/namespace/v1/namespace_message.proto
index c7a1c5cd..4c8d11ad 100644
--- a/temporal/api/namespace/v1/namespace-message.proto
+++ b/temporal/api/namespace/v1/namespace_message.proto
@@ -36,7 +36,7 @@ import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-namespace.proto";
+import "temporal/api/enums/v1/enums_namespace.proto";
 
 
 message NamespaceInfo {
diff --git a/temporal/api/operatorservice/v1/operatorservice-request_response.proto b/temporal/api/operatorservice/v1/operatorservice_request_response.proto
similarity index 98%
rename from temporal/api/operatorservice/v1/operatorservice-request_response.proto
rename to temporal/api/operatorservice/v1/operatorservice_request_response.proto
index 2c069f6e..978cd5ee 100644
--- a/temporal/api/operatorservice/v1/operatorservice-request_response.proto
+++ b/temporal/api/operatorservice/v1/operatorservice_request_response.proto
@@ -31,7 +31,7 @@ option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::OperatorService::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/enums-common.proto";
+import "temporal/api/enums/v1/enums_common.proto";
 
 // (-- Search Attribute --)
 
diff --git a/temporal/api/operatorservice/v1/operatorservice-service.proto b/temporal/api/operatorservice/v1/operatorservice_service.proto
similarity index 98%
rename from temporal/api/operatorservice/v1/operatorservice-service.proto
rename to temporal/api/operatorservice/v1/operatorservice_service.proto
index 92ca4551..4617cdbf 100644
--- a/temporal/api/operatorservice/v1/operatorservice-service.proto
+++ b/temporal/api/operatorservice/v1/operatorservice_service.proto
@@ -32,7 +32,7 @@ option ruby_package = "Temporal::Api::OperatorService::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.OperatorService";
 
 
-import "temporal/api/operatorservice/v1/operatorservice-request_response.proto";
+import "temporal/api/operatorservice/v1/operatorservice_request_response.proto";
 
 // OperatorService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to perform administrative functions like registering a search attribute or a namespace.
diff --git a/temporal/api/query/v1/query-message.proto b/temporal/api/query/v1/query_message.proto
similarity index 93%
rename from temporal/api/query/v1/query-message.proto
rename to temporal/api/query/v1/query_message.proto
index 63f319b7..3fdac3b2 100644
--- a/temporal/api/query/v1/query-message.proto
+++ b/temporal/api/query/v1/query_message.proto
@@ -31,9 +31,9 @@ option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Query::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/enums-query.proto";
-import "temporal/api/enums/v1/enums-workflow.proto";
-import "temporal/api/common/v1/common-message.proto";
+import "temporal/api/enums/v1/enums_query.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
+import "temporal/api/common/v1/common_message.proto";
 
 // See https://docs.temporal.io/docs/concepts/queries/
 message WorkflowQuery {
diff --git a/temporal/api/replication/v1/replication-message.proto b/temporal/api/replication/v1/replication_message.proto
similarity index 97%
rename from temporal/api/replication/v1/replication-message.proto
rename to temporal/api/replication/v1/replication_message.proto
index 2ed2159d..3e056c37 100644
--- a/temporal/api/replication/v1/replication-message.proto
+++ b/temporal/api/replication/v1/replication_message.proto
@@ -31,7 +31,7 @@ option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Replication::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/enums-namespace.proto";
+import "temporal/api/enums/v1/enums_namespace.proto";
 
 message ClusterReplicationConfig {
     string cluster_name = 1;
diff --git a/temporal/api/taskqueue/v1/taskqueue-message.proto b/temporal/api/taskqueue/v1/taskqueue_message.proto
similarity index 98%
rename from temporal/api/taskqueue/v1/taskqueue-message.proto
rename to temporal/api/taskqueue/v1/taskqueue_message.proto
index 8fc40083..012ba318 100644
--- a/temporal/api/taskqueue/v1/taskqueue-message.proto
+++ b/temporal/api/taskqueue/v1/taskqueue_message.proto
@@ -37,7 +37,7 @@ import "google/protobuf/wrappers.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-task_queue.proto";
+import "temporal/api/enums/v1/enums_task_queue.proto";
 
 // See https://docs.temporal.io/docs/concepts/task-queues/
 message TaskQueue {
diff --git a/temporal/api/version/v1/version-message.proto b/temporal/api/version/v1/version_message.proto
similarity index 97%
rename from temporal/api/version/v1/version-message.proto
rename to temporal/api/version/v1/version_message.proto
index 02ca9394..eeaba7d4 100644
--- a/temporal/api/version/v1/version-message.proto
+++ b/temporal/api/version/v1/version_message.proto
@@ -33,7 +33,7 @@ option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/timestamp.proto";
 import "dependencies/gogoproto/gogo.proto";
-import "temporal/api/enums/v1/enums-common.proto";
+import "temporal/api/enums/v1/enums_common.proto";
 
 // ReleaseInfo contains information about specific version of temporal.
 message ReleaseInfo {
diff --git a/temporal/api/workflow/v1/workflow-message.proto b/temporal/api/workflow/v1/workflow_message.proto
similarity index 95%
rename from temporal/api/workflow/v1/workflow-message.proto
rename to temporal/api/workflow/v1/workflow_message.proto
index 931c37a1..5572f46e 100644
--- a/temporal/api/workflow/v1/workflow-message.proto
+++ b/temporal/api/workflow/v1/workflow_message.proto
@@ -36,10 +36,10 @@ import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/enums-workflow.proto";
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/failure/v1/failure-message.proto";
-import "temporal/api/taskqueue/v1/taskqueue-message.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/failure/v1/failure_message.proto";
+import "temporal/api/taskqueue/v1/taskqueue_message.proto";
 
 message WorkflowExecutionInfo {
     temporal.api.common.v1.WorkflowExecution execution = 1;
diff --git a/temporal/api/workflowservice/v1/workflowservice-request_response.proto b/temporal/api/workflowservice/v1/workflowservice_request_response.proto
similarity index 96%
rename from temporal/api/workflowservice/v1/workflowservice-request_response.proto
rename to temporal/api/workflowservice/v1/workflowservice_request_response.proto
index f67acfba..a9fcc31a 100644
--- a/temporal/api/workflowservice/v1/workflowservice-request_response.proto
+++ b/temporal/api/workflowservice/v1/workflowservice_request_response.proto
@@ -31,24 +31,24 @@ option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::WorkflowService::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/enums-workflow.proto";
-import "temporal/api/enums/v1/enums-namespace.proto";
-import "temporal/api/enums/v1/enums-failed_cause.proto";
-import "temporal/api/enums/v1/enums-common.proto";
-import "temporal/api/enums/v1/enums-query.proto";
-import "temporal/api/enums/v1/enums-reset.proto";
-import "temporal/api/enums/v1/enums-task_queue.proto";
-import "temporal/api/common/v1/common-message.proto";
-import "temporal/api/history/v1/history-message.proto";
-import "temporal/api/workflow/v1/workflow-message.proto";
-import "temporal/api/command/v1/command-message.proto";
-import "temporal/api/failure/v1/failure-message.proto";
-import "temporal/api/filter/v1/filter-message.proto";
-import "temporal/api/namespace/v1/namespace-message.proto";
-import "temporal/api/query/v1/query-message.proto";
-import "temporal/api/replication/v1/replication-message.proto";
-import "temporal/api/taskqueue/v1/taskqueue-message.proto";
-import "temporal/api/version/v1/version-message.proto";
+import "temporal/api/enums/v1/enums_workflow.proto";
+import "temporal/api/enums/v1/enums_namespace.proto";
+import "temporal/api/enums/v1/enums_failed_cause.proto";
+import "temporal/api/enums/v1/enums_common.proto";
+import "temporal/api/enums/v1/enums_query.proto";
+import "temporal/api/enums/v1/enums_reset.proto";
+import "temporal/api/enums/v1/enums_task_queue.proto";
+import "temporal/api/common/v1/common_message.proto";
+import "temporal/api/history/v1/history_message.proto";
+import "temporal/api/workflow/v1/workflow_message.proto";
+import "temporal/api/command/v1/command_message.proto";
+import "temporal/api/failure/v1/failure_message.proto";
+import "temporal/api/filter/v1/filter_message.proto";
+import "temporal/api/namespace/v1/namespace_message.proto";
+import "temporal/api/query/v1/query_message.proto";
+import "temporal/api/replication/v1/replication_message.proto";
+import "temporal/api/taskqueue/v1/taskqueue_message.proto";
+import "temporal/api/version/v1/version_message.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/temporal/api/workflowservice/v1/workflowservice-service.proto b/temporal/api/workflowservice/v1/workflowservice_service.proto
similarity index 99%
rename from temporal/api/workflowservice/v1/workflowservice-service.proto
rename to temporal/api/workflowservice/v1/workflowservice_service.proto
index e6cfafef..3eb87033 100644
--- a/temporal/api/workflowservice/v1/workflowservice-service.proto
+++ b/temporal/api/workflowservice/v1/workflowservice_service.proto
@@ -32,7 +32,7 @@ option ruby_package = "Temporal::Api::WorkflowService::V1";
 option csharp_namespace = "Temporal.ServiceApi.V1.WorkflowService";
 
 
-import "temporal/api/workflowservice/v1/workflowservice-request_response.proto";
+import "temporal/api/workflowservice/v1/workflowservice_request_response.proto";
 
 // WorkflowService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to create and interact with workflows and activities.