diff --git a/network/evpn-gw/v1alpha1/l2_xpu_infra_mgr.proto b/network/evpn-gw/v1alpha1/l2_xpu_infra_mgr.proto
index ada410ba..97cf9d26 100644
--- a/network/evpn-gw/v1alpha1/l2_xpu_infra_mgr.proto
+++ b/network/evpn-gw/v1alpha1/l2_xpu_infra_mgr.proto
@@ -120,8 +120,7 @@ message LogicalBridge {
     // user can only set {resource}_id on the Create request object
     // Format: logicalBridges/{logical_bridge}
     string name                = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.network.evpn_gw.v1alpha1/LogicalBridge"
     ];
 
@@ -227,8 +226,7 @@ message BridgePort {
     // user can only set {resource}_id on the Create request object
     // Format: bridge_ports/{bridge_port}
     string name             = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.network.evpn_gw.v1alpha1/BridgePort"
     ];
 
diff --git a/network/evpn-gw/v1alpha1/l3_xpu_infra_mgr.proto b/network/evpn-gw/v1alpha1/l3_xpu_infra_mgr.proto
index 15740c0f..6fef9e95 100644
--- a/network/evpn-gw/v1alpha1/l3_xpu_infra_mgr.proto
+++ b/network/evpn-gw/v1alpha1/l3_xpu_infra_mgr.proto
@@ -123,8 +123,7 @@ message Vrf {
     // user can only set {resource}_id on the Create request object
     // Format: vrfs/{vrf}
     string name      = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.network.evpn_gw.v1alpha1/Vrf"
     ];
 
@@ -249,8 +248,7 @@ message Svi {
     // user can only set {resource}_id on the Create request object
     // Format: svis/{svi}
     string name      = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.network.evpn_gw.v1alpha1/Svi"
     ];
 
diff --git a/network/opinetcommon/v1alpha1/openconfig_interfaces.proto b/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
index ec7e9563..2e2d03c9 100644
--- a/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
+++ b/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
@@ -149,8 +149,7 @@ message NetInterface {
     // Name of the interface.  This is an opaque object that is not
     // user settable.  It is returned by the created object
     string name             = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.network.opinetcommon.v1alpha1/NetInterface"
     ];
     // Configuration settings - rw
diff --git a/storage/v1alpha1/backend_aio.proto b/storage/v1alpha1/backend_aio.proto
index b72ec16b..c727869c 100644
--- a/storage/v1alpha1/backend_aio.proto
+++ b/storage/v1alpha1/backend_aio.proto
@@ -80,8 +80,7 @@ message AioVolume {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/AioVolume"
     ];
 
diff --git a/storage/v1alpha1/backend_null.proto b/storage/v1alpha1/backend_null.proto
index c2bd821d..122e1de6 100755
--- a/storage/v1alpha1/backend_null.proto
+++ b/storage/v1alpha1/backend_null.proto
@@ -80,8 +80,7 @@ message NullVolume {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NullVolume"
     ];
 
diff --git a/storage/v1alpha1/backend_nvme_tcp.proto b/storage/v1alpha1/backend_nvme_tcp.proto
index 4cefa0f2..50c77fd0 100755
--- a/storage/v1alpha1/backend_nvme_tcp.proto
+++ b/storage/v1alpha1/backend_nvme_tcp.proto
@@ -146,8 +146,7 @@ message NvmeRemoteController {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmeRemoteController"
     ];
 
@@ -182,8 +181,7 @@ message NvmePath {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmePath"
     ];
 
@@ -227,8 +225,7 @@ message NvmeRemoteNamespace {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmeRemoteNamespace"
     ];
 
diff --git a/storage/v1alpha1/frontend_nvme_pcie.proto b/storage/v1alpha1/frontend_nvme_pcie.proto
index e2108049..ba2b54cd 100755
--- a/storage/v1alpha1/frontend_nvme_pcie.proto
+++ b/storage/v1alpha1/frontend_nvme_pcie.proto
@@ -171,8 +171,7 @@ message NvmeSubsystem {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmeSubsystem"
     ];
 
@@ -219,8 +218,7 @@ message NvmeController {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmeController"
     ];
 
@@ -289,8 +287,7 @@ message NvmeNamespace {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/NvmeNamespace"
     ];
 
diff --git a/storage/v1alpha1/frontend_virtio_blk.proto b/storage/v1alpha1/frontend_virtio_blk.proto
index e35358cc..32650a34 100755
--- a/storage/v1alpha1/frontend_virtio_blk.proto
+++ b/storage/v1alpha1/frontend_virtio_blk.proto
@@ -79,8 +79,7 @@ message VirtioBlk {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/VirtioBlk"
     ];
 
diff --git a/storage/v1alpha1/frontend_virtio_scsi.proto b/storage/v1alpha1/frontend_virtio_scsi.proto
index 67d69a41..87743fb1 100755
--- a/storage/v1alpha1/frontend_virtio_scsi.proto
+++ b/storage/v1alpha1/frontend_virtio_scsi.proto
@@ -167,8 +167,7 @@ message VirtioScsiTarget {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/VirtioScsiTarget"
     ];
 
@@ -188,8 +187,7 @@ message VirtioScsiController {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/VirtioScsiController"
     ];
 
@@ -215,8 +213,7 @@ message VirtioScsiLun {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/VirtioScsiLun"
     ];
 
diff --git a/storage/v1alpha1/middleend_encryption.proto b/storage/v1alpha1/middleend_encryption.proto
index 0c2cd19b..b4199f46 100755
--- a/storage/v1alpha1/middleend_encryption.proto
+++ b/storage/v1alpha1/middleend_encryption.proto
@@ -80,8 +80,7 @@ message EncryptedVolume {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/EncryptedVolume"
     ];
 
diff --git a/storage/v1alpha1/middleend_qos_volume.proto b/storage/v1alpha1/middleend_qos_volume.proto
index 7052e2b8..8fbdaa4e 100644
--- a/storage/v1alpha1/middleend_qos_volume.proto
+++ b/storage/v1alpha1/middleend_qos_volume.proto
@@ -77,8 +77,7 @@ message QosVolume {
     // name will be returned with created object
     // user can only set {resource}_id on the Create request object
     string name = 1 [
-        (google.api.field_behavior) = OUTPUT_ONLY,
-        (google.api.field_behavior) = IMMUTABLE,
+        (google.api.field_behavior) = IDENTIFIER,
         (google.api.resource_reference).type = "opi_api.storage.v1/QosVolume"
     ];