diff --git a/chasm/lib/activity/handler.go b/chasm/lib/activity/handler.go
index 49a46f9b33..3a80f2bde1 100644
--- a/chasm/lib/activity/handler.go
+++ b/chasm/lib/activity/handler.go
@@ -51,14 +51,14 @@ func newHandler(config *Config, metricsHandler metrics.Handler, logger log.Logge
 func (h *handler) StartActivityExecution(ctx context.Context, req *activitypb.StartActivityExecutionRequest) (*activitypb.StartActivityExecutionResponse, error) {
 	frontendReq := req.GetFrontendRequest()
 
-	reusePolicy, ok := businessIDReusePolicyMap[frontendReq.GetIdReusePolicy()]
+	reusePolicy, ok := businessIDReusePolicyMap[frontendReq.GetActivityIdReusePolicy()]
 	if !ok {
-		return nil, serviceerror.NewInvalidArgumentf("unsupported ID reuse policy: %v", frontendReq.GetIdReusePolicy())
+		return nil, serviceerror.NewInvalidArgumentf("unsupported ID reuse policy: %v", frontendReq.GetActivityIdReusePolicy())
 	}
 
-	conflictPolicy, ok := businessIDConflictPolicyMap[frontendReq.GetIdConflictPolicy()]
+	conflictPolicy, ok := businessIDConflictPolicyMap[frontendReq.GetActivityIdConflictPolicy()]
 	if !ok {
-		return nil, serviceerror.NewInvalidArgumentf("unsupported ID conflict policy: %v", frontendReq.GetIdConflictPolicy())
+		return nil, serviceerror.NewInvalidArgumentf("unsupported ID conflict policy: %v", frontendReq.GetActivityIdConflictPolicy())
 	}
 
 	result, err := chasm.StartExecution(
diff --git a/chasm/lib/activity/validator.go b/chasm/lib/activity/validator.go
index 3126312234..252aa56167 100644
--- a/chasm/lib/activity/validator.go
+++ b/chasm/lib/activity/validator.go
@@ -166,12 +166,12 @@ func normalizeAndValidateTimeouts(
 }
 
 func normalizeAndValidateIDPolicy(req *workflowservice.StartActivityExecutionRequest) error {
-	if req.GetIdReusePolicy() == enumspb.ACTIVITY_ID_REUSE_POLICY_UNSPECIFIED {
-		req.IdReusePolicy = enumspb.ACTIVITY_ID_REUSE_POLICY_ALLOW_DUPLICATE
+	if req.GetActivityIdReusePolicy() == enumspb.ACTIVITY_ID_REUSE_POLICY_UNSPECIFIED {
+		req.ActivityIdReusePolicy = enumspb.ACTIVITY_ID_REUSE_POLICY_ALLOW_DUPLICATE
 	}
 
-	if req.GetIdConflictPolicy() == enumspb.ACTIVITY_ID_CONFLICT_POLICY_UNSPECIFIED {
-		req.IdConflictPolicy = enumspb.ACTIVITY_ID_CONFLICT_POLICY_FAIL
+	if req.GetActivityIdConflictPolicy() == enumspb.ACTIVITY_ID_CONFLICT_POLICY_UNSPECIFIED {
+		req.ActivityIdConflictPolicy = enumspb.ACTIVITY_ID_CONFLICT_POLICY_FAIL
 	}
 
 	return nil