diff --git a/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.py b/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.py
index 3df6bf56..cacb244d 100644
--- a/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.py
+++ b/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.py
@@ -16,7 +16,7 @@
 from ni.measurements.metadata.v1 import metadata_store_pb2 as ni_dot_measurements_dot_metadata_dot_v1_dot_metadata__store__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(ni/measurements/data/v1/data_store.proto\x12\x17ni.measurements.data.v1\x1a+ni/protobuf/types/precision_timestamp.proto\x1a%ni/datamonikers/v1/data_moniker.proto\x1a\x30ni/measurements/metadata/v1/metadata_store.proto\"\x93\x01\n\x12PublishedCondition\x12,\n\x07moniker\x18\x01 \x01(\x0b\x32\x1b.ni.datamonikers.v1.Moniker\x12\n\n\x02id\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0f\n\x07step_id\x18\x05 \x01(\t\x12\x16\n\x0etest_result_id\x18\x06 \x01(\t\"\xd5\x04\n\x14PublishedMeasurement\x12,\n\x07moniker\x18\x01 \x01(\x0b\x32\x1b.ni.datamonikers.v1.Moniker\x12I\n\x14published_conditions\x18\x02 \x03(\x0b\x32+.ni.measurements.data.v1.PublishedCondition\x12\n\n\x02id\x18\x03 \x01(\t\x12\x16\n\x0etest_result_id\x18\x04 \x01(\t\x12\x0f\n\x07step_id\x18\x05 \x01(\t\x12\x19\n\x11software_item_ids\x18\x06 \x03(\t\x12\x19\n\x11hardware_item_ids\x18\x07 \x03(\t\x12\x18\n\x10test_adapter_ids\x18\x08 \x03(\t\x12\x0c\n\x04name\x18\t \x01(\t\x12\x11\n\tdata_type\x18\n \x01(\t\x12\r\n\x05notes\x18\x0b \x01(\t\x12>\n\x0fstart_date_time\x18\x0c \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\r \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\x0e \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x18\n\x10parametric_index\x18\x0f \x01(\x05\x12\x44\n\x11\x65rror_information\x18\x10 \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\"\x9b\x05\n\nTestResult\x12\n\n\x02id\x18\x01 \x01(\t\x12\x17\n\x0fuut_instance_id\x18\x02 \x01(\t\x12\x13\n\x0boperator_id\x18\x03 \x01(\t\x12\x17\n\x0ftest_station_id\x18\x04 \x01(\t\x12\x1b\n\x13test_description_id\x18\x05 \x01(\t\x12\x19\n\x11software_item_ids\x18\x06 \x03(\t\x12\x19\n\x11hardware_item_ids\x18\x07 \x03(\t\x12\x18\n\x10test_adapter_ids\x18\x08 \x03(\t\x12\x0c\n\x04name\x18\t \x01(\t\x12>\n\x0fstart_date_time\x18\n \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\x0b \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\x0c \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x44\n\x11\x65rror_information\x18\r \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\x12\x0c\n\x04link\x18\x0e \x01(\t\x12G\n\nextensions\x18\x0f \x03(\x0b\x32\x33.ni.measurements.data.v1.TestResult.ExtensionsEntry\x12\x11\n\tschema_id\x18\x10 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xb9\x04\n\x04Step\x12\n\n\x02id\x18\x01 \x01(\t\x12\x16\n\x0eparent_step_id\x18\x02 \x01(\t\x12\x16\n\x0etest_result_id\x18\x03 \x01(\t\x12\x0f\n\x07test_id\x18\x04 \x01(\t\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\x0c\n\x04type\x18\x06 \x01(\t\x12\r\n\x05notes\x18\x07 \x01(\t\x12>\n\x0fstart_date_time\x18\x08 \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\t \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\n \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x44\n\x11\x65rror_information\x18\x0b \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\x12\x0c\n\x04link\x18\x0c \x01(\t\x12\x41\n\nextensions\x18\r \x03(\x0b\x32-.ni.measurements.data.v1.Step.ExtensionsEntry\x12\x11\n\tschema_id\x18\x0e \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"G\n\x10\x45rrorInformation\x12\x12\n\nerror_code\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06source\x18\x03 \x01(\t*e\n\x07Outcome\x12\x17\n\x13OUTCOME_UNSPECIFIED\x10\x00\x12\x12\n\x0eOUTCOME_PASSED\x10\x01\x12\x12\n\x0eOUTCOME_FAILED\x10\x02\x12\x19\n\x15OUTCOME_INDETERMINATE\x10\x03\x42\xa0\x01\n\x1b\x63om.ni.measurements.data.v1B\x0e\x44\x61taStoreProtoP\x01Z\x06\x64\x61tav1\xa2\x02\x04NIMD\xaa\x02(NationalInstruments.Measurements.Data.V1\xca\x02\x17NI\\Measurements\\Data\\V1\xea\x02\x1aNI::Measurements::Data::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(ni/measurements/data/v1/data_store.proto\x12\x17ni.measurements.data.v1\x1a+ni/protobuf/types/precision_timestamp.proto\x1a%ni/datamonikers/v1/data_moniker.proto\x1a\x30ni/measurements/metadata/v1/metadata_store.proto\"\x9d\x01\n\x12PublishedCondition\x12,\n\x07moniker\x18\x01 \x01(\x0b\x32\x1b.ni.datamonikers.v1.Moniker\x12\n\n\x02id\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x16\n\x0e\x63ondition_type\x18\x04 \x01(\t\x12\x0f\n\x07step_id\x18\x05 \x01(\t\x12\x16\n\x0etest_result_id\x18\x06 \x01(\t\"\xd6\x04\n\x14PublishedMeasurement\x12,\n\x07moniker\x18\x01 \x01(\x0b\x32\x1b.ni.datamonikers.v1.Moniker\x12I\n\x14published_conditions\x18\x02 \x03(\x0b\x32+.ni.measurements.data.v1.PublishedCondition\x12\n\n\x02id\x18\x03 \x01(\t\x12\x16\n\x0etest_result_id\x18\x04 \x01(\t\x12\x0f\n\x07step_id\x18\x05 \x01(\t\x12\x19\n\x11software_item_ids\x18\x06 \x03(\t\x12\x19\n\x11hardware_item_ids\x18\x07 \x03(\t\x12\x18\n\x10test_adapter_ids\x18\x08 \x03(\t\x12\x0c\n\x04name\x18\t \x01(\t\x12\x12\n\nvalue_type\x18\n \x01(\t\x12\r\n\x05notes\x18\x0b \x01(\t\x12>\n\x0fstart_date_time\x18\x0c \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\r \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\x0e \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x18\n\x10parametric_index\x18\x0f \x01(\x05\x12\x44\n\x11\x65rror_information\x18\x10 \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\"\x98\x05\n\nTestResult\x12\n\n\x02id\x18\x01 \x01(\t\x12\x17\n\x0fuut_instance_id\x18\x02 \x01(\t\x12\x13\n\x0boperator_id\x18\x03 \x01(\t\x12\x17\n\x0ftest_station_id\x18\x04 \x01(\t\x12\x1b\n\x13test_description_id\x18\x05 \x01(\t\x12\x19\n\x11software_item_ids\x18\x06 \x03(\t\x12\x19\n\x11hardware_item_ids\x18\x07 \x03(\t\x12\x18\n\x10test_adapter_ids\x18\x08 \x03(\t\x12\x0c\n\x04name\x18\t \x01(\t\x12>\n\x0fstart_date_time\x18\n \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\x0b \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\x0c \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x44\n\x11\x65rror_information\x18\r \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\x12\x0c\n\x04link\x18\x0e \x01(\t\x12\x45\n\textension\x18\x0f \x03(\x0b\x32\x32.ni.measurements.data.v1.TestResult.ExtensionEntry\x12\x11\n\tschema_id\x18\x10 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xbb\x04\n\x04Step\x12\n\n\x02id\x18\x01 \x01(\t\x12\x16\n\x0eparent_step_id\x18\x02 \x01(\t\x12\x16\n\x0etest_result_id\x18\x03 \x01(\t\x12\x0f\n\x07test_id\x18\x04 \x01(\t\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\x11\n\tstep_type\x18\x06 \x01(\t\x12\r\n\x05notes\x18\x07 \x01(\t\x12>\n\x0fstart_date_time\x18\x08 \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12<\n\rend_date_time\x18\t \x01(\x0b\x32%.ni.protobuf.types.PrecisionTimestamp\x12\x31\n\x07outcome\x18\n \x01(\x0e\x32 .ni.measurements.data.v1.Outcome\x12\x44\n\x11\x65rror_information\x18\x0b \x01(\x0b\x32).ni.measurements.data.v1.ErrorInformation\x12\x0c\n\x04link\x18\x0c \x01(\t\x12?\n\textension\x18\r \x03(\x0b\x32,.ni.measurements.data.v1.Step.ExtensionEntry\x12\x11\n\tschema_id\x18\x0e \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"G\n\x10\x45rrorInformation\x12\x12\n\nerror_code\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06source\x18\x03 \x01(\t*e\n\x07Outcome\x12\x17\n\x13OUTCOME_UNSPECIFIED\x10\x00\x12\x12\n\x0eOUTCOME_PASSED\x10\x01\x12\x12\n\x0eOUTCOME_FAILED\x10\x02\x12\x19\n\x15OUTCOME_INDETERMINATE\x10\x03\x42\xa0\x01\n\x1b\x63om.ni.measurements.data.v1B\x0e\x44\x61taStoreProtoP\x01Z\x06\x64\x61tav1\xa2\x02\x04NIMD\xaa\x02(NationalInstruments.Measurements.Data.V1\xca\x02\x17NI\\Measurements\\Data\\V1\xea\x02\x1aNI::Measurements::Data::V1b\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ni.measurements.data.v1.data_store_pb2', globals())
@@ -24,24 +24,24 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\033com.ni.measurements.data.v1B\016DataStoreProtoP\001Z\006datav1\242\002\004NIMD\252\002(NationalInstruments.Measurements.Data.V1\312\002\027NI\\Measurements\\Data\\V1\352\002\032NI::Measurements::Data::V1'
-  _TESTRESULT_EXTENSIONSENTRY._options = None
-  _TESTRESULT_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _STEP_EXTENSIONSENTRY._options = None
-  _STEP_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _OUTCOME._serialized_start=2268
-  _OUTCOME._serialized_end=2369
+  _TESTRESULT_EXTENSIONENTRY._options = None
+  _TESTRESULT_EXTENSIONENTRY._serialized_options = b'8\001'
+  _STEP_EXTENSIONENTRY._options = None
+  _STEP_EXTENSIONENTRY._serialized_options = b'8\001'
+  _OUTCOME._serialized_start=2278
+  _OUTCOME._serialized_end=2379
   _PUBLISHEDCONDITION._serialized_start=204
-  _PUBLISHEDCONDITION._serialized_end=351
-  _PUBLISHEDMEASUREMENT._serialized_start=354
-  _PUBLISHEDMEASUREMENT._serialized_end=951
-  _TESTRESULT._serialized_start=954
-  _TESTRESULT._serialized_end=1621
-  _TESTRESULT_EXTENSIONSENTRY._serialized_start=1527
-  _TESTRESULT_EXTENSIONSENTRY._serialized_end=1621
-  _STEP._serialized_start=1624
-  _STEP._serialized_end=2193
-  _STEP_EXTENSIONSENTRY._serialized_start=1527
-  _STEP_EXTENSIONSENTRY._serialized_end=1621
-  _ERRORINFORMATION._serialized_start=2195
-  _ERRORINFORMATION._serialized_end=2266
+  _PUBLISHEDCONDITION._serialized_end=361
+  _PUBLISHEDMEASUREMENT._serialized_start=364
+  _PUBLISHEDMEASUREMENT._serialized_end=962
+  _TESTRESULT._serialized_start=965
+  _TESTRESULT._serialized_end=1629
+  _TESTRESULT_EXTENSIONENTRY._serialized_start=1536
+  _TESTRESULT_EXTENSIONENTRY._serialized_end=1629
+  _STEP._serialized_start=1632
+  _STEP._serialized_end=2203
+  _STEP_EXTENSIONENTRY._serialized_start=1536
+  _STEP_EXTENSIONENTRY._serialized_end=1629
+  _ERRORINFORMATION._serialized_start=2205
+  _ERRORINFORMATION._serialized_end=2276
 # @@protoc_insertion_point(module_scope)
diff --git a/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.pyi b/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.pyi
index 5ad2a895..f7e01e28 100644
--- a/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.pyi
+++ b/packages/ni.measurements.data.v1.proto/src/ni/measurements/data/v1/data_store_pb2/__init__.pyi
@@ -57,7 +57,7 @@ class PublishedCondition(google.protobuf.message.Message):
     MONIKER_FIELD_NUMBER: builtins.int
     ID_FIELD_NUMBER: builtins.int
     NAME_FIELD_NUMBER: builtins.int
-    TYPE_FIELD_NUMBER: builtins.int
+    CONDITION_TYPE_FIELD_NUMBER: builtins.int
     STEP_ID_FIELD_NUMBER: builtins.int
     TEST_RESULT_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
@@ -66,7 +66,7 @@ class PublishedCondition(google.protobuf.message.Message):
     """
     name: builtins.str
     """The name of the condition."""
-    type: builtins.str
+    condition_type: builtins.str
     """The type of the condition. For example, "Setup" or "Environment"."""
     step_id: builtins.str
     """The id of the step with which this condition is associated."""
@@ -84,12 +84,12 @@ class PublishedCondition(google.protobuf.message.Message):
         moniker: ni.datamonikers.v1.data_moniker_pb2.Moniker | None = ...,
         id: builtins.str = ...,
         name: builtins.str = ...,
-        type: builtins.str = ...,
+        condition_type: builtins.str = ...,
         step_id: builtins.str = ...,
         test_result_id: builtins.str = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["moniker", b"moniker"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["id", b"id", "moniker", b"moniker", "name", b"name", "step_id", b"step_id", "test_result_id", b"test_result_id", "type", b"type"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["condition_type", b"condition_type", "id", b"id", "moniker", b"moniker", "name", b"name", "step_id", b"step_id", "test_result_id", b"test_result_id"]) -> None: ...
 
 global___PublishedCondition = PublishedCondition
 
@@ -106,7 +106,7 @@ class PublishedMeasurement(google.protobuf.message.Message):
     HARDWARE_ITEM_IDS_FIELD_NUMBER: builtins.int
     TEST_ADAPTER_IDS_FIELD_NUMBER: builtins.int
     NAME_FIELD_NUMBER: builtins.int
-    DATA_TYPE_FIELD_NUMBER: builtins.int
+    VALUE_TYPE_FIELD_NUMBER: builtins.int
     NOTES_FIELD_NUMBER: builtins.int
     START_DATE_TIME_FIELD_NUMBER: builtins.int
     END_DATE_TIME_FIELD_NUMBER: builtins.int
@@ -121,8 +121,8 @@ class PublishedMeasurement(google.protobuf.message.Message):
     """The id of the step with which this measurement is associated."""
     name: builtins.str
     """The name used to group measurements across multiple publishes."""
-    data_type: builtins.str
-    """The type of the measurement. This is used to filter measurements in queries."""
+    value_type: builtins.str
+    """The type of the value of the measurement. This is used to filter measurements in queries."""
     notes: builtins.str
     """Any notes about the measurement."""
     outcome: global___Outcome.ValueType
@@ -183,7 +183,7 @@ class PublishedMeasurement(google.protobuf.message.Message):
         hardware_item_ids: collections.abc.Iterable[builtins.str] | None = ...,
         test_adapter_ids: collections.abc.Iterable[builtins.str] | None = ...,
         name: builtins.str = ...,
-        data_type: builtins.str = ...,
+        value_type: builtins.str = ...,
         notes: builtins.str = ...,
         start_date_time: ni.protobuf.types.precision_timestamp_pb2.PrecisionTimestamp | None = ...,
         end_date_time: ni.protobuf.types.precision_timestamp_pb2.PrecisionTimestamp | None = ...,
@@ -192,7 +192,7 @@ class PublishedMeasurement(google.protobuf.message.Message):
         error_information: global___ErrorInformation | None = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "moniker", b"moniker", "start_date_time", b"start_date_time"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["data_type", b"data_type", "end_date_time", b"end_date_time", "error_information", b"error_information", "hardware_item_ids", b"hardware_item_ids", "id", b"id", "moniker", b"moniker", "name", b"name", "notes", b"notes", "outcome", b"outcome", "parametric_index", b"parametric_index", "published_conditions", b"published_conditions", "software_item_ids", b"software_item_ids", "start_date_time", b"start_date_time", "step_id", b"step_id", "test_adapter_ids", b"test_adapter_ids", "test_result_id", b"test_result_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "hardware_item_ids", b"hardware_item_ids", "id", b"id", "moniker", b"moniker", "name", b"name", "notes", b"notes", "outcome", b"outcome", "parametric_index", b"parametric_index", "published_conditions", b"published_conditions", "software_item_ids", b"software_item_ids", "start_date_time", b"start_date_time", "step_id", b"step_id", "test_adapter_ids", b"test_adapter_ids", "test_result_id", b"test_result_id", "value_type", b"value_type"]) -> None: ...
 
 global___PublishedMeasurement = PublishedMeasurement
 
@@ -203,7 +203,7 @@ class TestResult(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -234,7 +234,7 @@ class TestResult(google.protobuf.message.Message):
     OUTCOME_FIELD_NUMBER: builtins.int
     ERROR_INFORMATION_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """Optional.
@@ -325,8 +325,11 @@ class TestResult(google.protobuf.message.Message):
         """
 
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue]:
-        """Optional. Any extensions to be associated with the test result."""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your test result
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -345,11 +348,11 @@ class TestResult(google.protobuf.message.Message):
         outcome: global___Outcome.ValueType = ...,
         error_information: global___ErrorInformation | None = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "start_date_time", b"start_date_time"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "extensions", b"extensions", "hardware_item_ids", b"hardware_item_ids", "id", b"id", "link", b"link", "name", b"name", "operator_id", b"operator_id", "outcome", b"outcome", "schema_id", b"schema_id", "software_item_ids", b"software_item_ids", "start_date_time", b"start_date_time", "test_adapter_ids", b"test_adapter_ids", "test_description_id", b"test_description_id", "test_station_id", b"test_station_id", "uut_instance_id", b"uut_instance_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "extension", b"extension", "hardware_item_ids", b"hardware_item_ids", "id", b"id", "link", b"link", "name", b"name", "operator_id", b"operator_id", "outcome", b"outcome", "schema_id", b"schema_id", "software_item_ids", b"software_item_ids", "start_date_time", b"start_date_time", "test_adapter_ids", b"test_adapter_ids", "test_description_id", b"test_description_id", "test_station_id", b"test_station_id", "uut_instance_id", b"uut_instance_id"]) -> None: ...
 
 global___TestResult = TestResult
 
@@ -360,7 +363,7 @@ class Step(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -382,14 +385,14 @@ class Step(google.protobuf.message.Message):
     TEST_RESULT_ID_FIELD_NUMBER: builtins.int
     TEST_ID_FIELD_NUMBER: builtins.int
     NAME_FIELD_NUMBER: builtins.int
-    TYPE_FIELD_NUMBER: builtins.int
+    STEP_TYPE_FIELD_NUMBER: builtins.int
     NOTES_FIELD_NUMBER: builtins.int
     START_DATE_TIME_FIELD_NUMBER: builtins.int
     END_DATE_TIME_FIELD_NUMBER: builtins.int
     OUTCOME_FIELD_NUMBER: builtins.int
     ERROR_INFORMATION_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the step
@@ -411,7 +414,7 @@ class Step(google.protobuf.message.Message):
     """
     name: builtins.str
     """Required. The name of the step."""
-    type: builtins.str
+    step_type: builtins.str
     """Step type (e.g., Setup, Action, Measurement, Cleanup)"""
     notes: builtins.str
     """Any notes about the step"""
@@ -429,9 +432,7 @@ class Step(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the test step is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
     def start_date_time(self) -> ni.protobuf.types.precision_timestamp_pb2.PrecisionTimestamp:
@@ -450,8 +451,11 @@ class Step(google.protobuf.message.Message):
         """
 
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue]:
-        """Any extensions to be associated with the test step"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your test step
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -461,18 +465,18 @@ class Step(google.protobuf.message.Message):
         test_result_id: builtins.str = ...,
         test_id: builtins.str = ...,
         name: builtins.str = ...,
-        type: builtins.str = ...,
+        step_type: builtins.str = ...,
         notes: builtins.str = ...,
         start_date_time: ni.protobuf.types.precision_timestamp_pb2.PrecisionTimestamp | None = ...,
         end_date_time: ni.protobuf.types.precision_timestamp_pb2.PrecisionTimestamp | None = ...,
         outcome: global___Outcome.ValueType = ...,
         error_information: global___ErrorInformation | None = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, ni.measurements.metadata.v1.metadata_store_pb2.ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "start_date_time", b"start_date_time"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "extensions", b"extensions", "id", b"id", "link", b"link", "name", b"name", "notes", b"notes", "outcome", b"outcome", "parent_step_id", b"parent_step_id", "schema_id", b"schema_id", "start_date_time", b"start_date_time", "test_id", b"test_id", "test_result_id", b"test_result_id", "type", b"type"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["end_date_time", b"end_date_time", "error_information", b"error_information", "extension", b"extension", "id", b"id", "link", b"link", "name", b"name", "notes", b"notes", "outcome", b"outcome", "parent_step_id", b"parent_step_id", "schema_id", b"schema_id", "start_date_time", b"start_date_time", "step_type", b"step_type", "test_id", b"test_id", "test_result_id", b"test_result_id"]) -> None: ...
 
 global___Step = Step
 
diff --git a/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.py b/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.py
index 289b2c26..a86bbb38 100644
--- a/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.py
+++ b/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.py
@@ -13,7 +13,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0ni/measurements/metadata/v1/metadata_store.proto\x12\x1bni.measurements.metadata.v1\"\xdd\x02\n\x0bUutInstance\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06uut_id\x18\x02 \x01(\t\x12\x15\n\rserial_number\x18\x03 \x01(\t\x12\x18\n\x10manufacture_date\x18\x04 \x01(\t\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x18\n\x10hardware_version\x18\x06 \x01(\t\x12\x0c\n\x04link\x18\x07 \x01(\t\x12L\n\nextensions\x18\x08 \x03(\x0b\x32\x38.ni.measurements.metadata.v1.UutInstance.ExtensionsEntry\x12\x11\n\tschema_id\x18\t \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xa8\x02\n\x03Uut\x12\n\n\x02id\x18\x01 \x01(\t\x12\x12\n\nmodel_name\x18\x02 \x01(\t\x12\x0e\n\x06\x66\x61mily\x18\x03 \x01(\t\x12\x15\n\rmanufacturers\x18\x04 \x03(\t\x12\x13\n\x0bpart_number\x18\x05 \x01(\t\x12\x0c\n\x04link\x18\x06 \x01(\t\x12\x44\n\nextensions\x18\x07 \x03(\x0b\x32\x30.ni.measurements.metadata.v1.Uut.ExtensionsEntry\x12\x11\n\tschema_id\x18\x08 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xf3\x02\n\x0cHardwareItem\x12\n\n\x02id\x18\x01 \x01(\t\x12\x14\n\x0cmanufacturer\x18\x02 \x01(\t\x12\r\n\x05model\x18\x03 \x01(\t\x12\x15\n\rserial_number\x18\x04 \x01(\t\x12\x13\n\x0bpart_number\x18\x05 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x06 \x01(\t\x12\x1c\n\x14\x63\x61libration_due_date\x18\x07 \x01(\t\x12\x0c\n\x04link\x18\x08 \x01(\t\x12M\n\nextensions\x18\t \x03(\x0b\x32\x39.ni.measurements.metadata.v1.HardwareItem.ExtensionsEntry\x12\x11\n\tschema_id\x18\n \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xff\x02\n\x0bTestAdapter\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0cmanufacturer\x18\x03 \x01(\t\x12\r\n\x05model\x18\x04 \x01(\t\x12\x15\n\rserial_number\x18\x05 \x01(\t\x12\x13\n\x0bpart_number\x18\x06 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x07 \x01(\t\x12\x1c\n\x14\x63\x61libration_due_date\x18\x08 \x01(\t\x12\x0c\n\x04link\x18\t \x01(\t\x12L\n\nextensions\x18\n \x03(\x0b\x32\x38.ni.measurements.metadata.v1.TestAdapter.ExtensionsEntry\x12\x11\n\tschema_id\x18\x0b \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x8c\x02\n\x0cSoftwareItem\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07product\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12M\n\nextensions\x18\x05 \x03(\x0b\x32\x39.ni.measurements.metadata.v1.SoftwareItem.ExtensionsEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xfe\x01\n\x08Operator\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04role\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12I\n\nextensions\x18\x05 \x03(\x0b\x32\x35.ni.measurements.metadata.v1.Operator.ExtensionsEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x8e\x02\n\x0fTestDescription\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06uut_id\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12P\n\nextensions\x18\x05 \x03(\x0b\x32<.ni.measurements.metadata.v1.TestDescription.ExtensionsEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xfd\x01\n\x04Test\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12\x45\n\nextensions\x18\x05 \x03(\x0b\x32\x31.ni.measurements.metadata.v1.Test.ExtensionsEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x90\x02\n\x0bTestStation\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12L\n\nextensions\x18\x05 \x03(\x0b\x32\x38.ni.measurements.metadata.v1.TestStation.ExtensionsEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a^\n\x0f\x45xtensionsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"4\n\x0e\x45xtensionValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x42\n\n\x08metadata\"-\n\x0f\x45xtensionSchema\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06schema\x18\x02 \x01(\t\"k\n\x05\x41lias\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x41\n\x0btarget_type\x18\x02 \x01(\x0e\x32,.ni.measurements.metadata.v1.AliasTargetType\x12\x11\n\ttarget_id\x18\x03 \x01(\t*\xe9\x02\n\x0f\x41liasTargetType\x12!\n\x1d\x41LIAS_TARGET_TYPE_UNSPECIFIED\x10\x00\x12\"\n\x1e\x41LIAS_TARGET_TYPE_UUT_INSTANCE\x10\x01\x12\x19\n\x15\x41LIAS_TARGET_TYPE_UUT\x10\x02\x12#\n\x1f\x41LIAS_TARGET_TYPE_HARDWARE_ITEM\x10\x03\x12#\n\x1f\x41LIAS_TARGET_TYPE_SOFTWARE_ITEM\x10\x04\x12\x1e\n\x1a\x41LIAS_TARGET_TYPE_OPERATOR\x10\x05\x12&\n\"ALIAS_TARGET_TYPE_TEST_DESCRIPTION\x10\x06\x12\x1a\n\x16\x41LIAS_TARGET_TYPE_TEST\x10\x07\x12\"\n\x1e\x41LIAS_TARGET_TYPE_TEST_STATION\x10\x08\x12\"\n\x1e\x41LIAS_TARGET_TYPE_TEST_ADAPTER\x10\tB\xb8\x01\n\x1f\x63om.ni.measurements.metadata.v1B\x12MetadataStoreProtoP\x01Z\nmetadatav1\xa2\x02\x04NIMM\xaa\x02,NationalInstruments.Measurements.Metadata.V1\xca\x02\x1bNI\\Measurements\\Metadata\\V1\xea\x02\x1eNI::Measurements::Metadata::V1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0ni/measurements/metadata/v1/metadata_store.proto\x12\x1bni.measurements.metadata.v1\"\xda\x02\n\x0bUutInstance\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06uut_id\x18\x02 \x01(\t\x12\x15\n\rserial_number\x18\x03 \x01(\t\x12\x18\n\x10manufacture_date\x18\x04 \x01(\t\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x18\n\x10hardware_version\x18\x06 \x01(\t\x12\x0c\n\x04link\x18\x07 \x01(\t\x12J\n\textension\x18\x08 \x03(\x0b\x32\x37.ni.measurements.metadata.v1.UutInstance.ExtensionEntry\x12\x11\n\tschema_id\x18\t \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xa5\x02\n\x03Uut\x12\n\n\x02id\x18\x01 \x01(\t\x12\x12\n\nmodel_name\x18\x02 \x01(\t\x12\x0e\n\x06\x66\x61mily\x18\x03 \x01(\t\x12\x15\n\rmanufacturers\x18\x04 \x03(\t\x12\x13\n\x0bpart_number\x18\x05 \x01(\t\x12\x0c\n\x04link\x18\x06 \x01(\t\x12\x42\n\textension\x18\x07 \x03(\x0b\x32/.ni.measurements.metadata.v1.Uut.ExtensionEntry\x12\x11\n\tschema_id\x18\x08 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xf0\x02\n\x0cHardwareItem\x12\n\n\x02id\x18\x01 \x01(\t\x12\x14\n\x0cmanufacturer\x18\x02 \x01(\t\x12\r\n\x05model\x18\x03 \x01(\t\x12\x15\n\rserial_number\x18\x04 \x01(\t\x12\x13\n\x0bpart_number\x18\x05 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x06 \x01(\t\x12\x1c\n\x14\x63\x61libration_due_date\x18\x07 \x01(\t\x12\x0c\n\x04link\x18\x08 \x01(\t\x12K\n\textension\x18\t \x03(\x0b\x32\x38.ni.measurements.metadata.v1.HardwareItem.ExtensionEntry\x12\x11\n\tschema_id\x18\n \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xfc\x02\n\x0bTestAdapter\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x14\n\x0cmanufacturer\x18\x03 \x01(\t\x12\r\n\x05model\x18\x04 \x01(\t\x12\x15\n\rserial_number\x18\x05 \x01(\t\x12\x13\n\x0bpart_number\x18\x06 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x07 \x01(\t\x12\x1c\n\x14\x63\x61libration_due_date\x18\x08 \x01(\t\x12\x0c\n\x04link\x18\t \x01(\t\x12J\n\textension\x18\n \x03(\x0b\x32\x37.ni.measurements.metadata.v1.TestAdapter.ExtensionEntry\x12\x11\n\tschema_id\x18\x0b \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x89\x02\n\x0cSoftwareItem\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0f\n\x07product\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12K\n\textension\x18\x05 \x03(\x0b\x32\x38.ni.measurements.metadata.v1.SoftwareItem.ExtensionEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xfb\x01\n\x08Operator\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04role\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12G\n\textension\x18\x05 \x03(\x0b\x32\x34.ni.measurements.metadata.v1.Operator.ExtensionEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x8b\x02\n\x0fTestDescription\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06uut_id\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12N\n\textension\x18\x05 \x03(\x0b\x32;.ni.measurements.metadata.v1.TestDescription.ExtensionEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\xfa\x01\n\x04Test\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12\x43\n\textension\x18\x05 \x03(\x0b\x32\x30.ni.measurements.metadata.v1.Test.ExtensionEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"\x8d\x02\n\x0bTestStation\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x18\n\x10\x61sset_identifier\x18\x03 \x01(\t\x12\x0c\n\x04link\x18\x04 \x01(\t\x12J\n\textension\x18\x05 \x03(\x0b\x32\x37.ni.measurements.metadata.v1.TestStation.ExtensionEntry\x12\x11\n\tschema_id\x18\x06 \x01(\t\x1a]\n\x0e\x45xtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.ni.measurements.metadata.v1.ExtensionValue:\x02\x38\x01\"4\n\x0e\x45xtensionValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x42\n\n\x08metadata\"-\n\x0f\x45xtensionSchema\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06schema\x18\x02 \x01(\t\"k\n\x05\x41lias\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x41\n\x0btarget_type\x18\x02 \x01(\x0e\x32,.ni.measurements.metadata.v1.AliasTargetType\x12\x11\n\ttarget_id\x18\x03 \x01(\t*\xe9\x02\n\x0f\x41liasTargetType\x12!\n\x1d\x41LIAS_TARGET_TYPE_UNSPECIFIED\x10\x00\x12\"\n\x1e\x41LIAS_TARGET_TYPE_UUT_INSTANCE\x10\x01\x12\x19\n\x15\x41LIAS_TARGET_TYPE_UUT\x10\x02\x12#\n\x1f\x41LIAS_TARGET_TYPE_HARDWARE_ITEM\x10\x03\x12#\n\x1f\x41LIAS_TARGET_TYPE_SOFTWARE_ITEM\x10\x04\x12\x1e\n\x1a\x41LIAS_TARGET_TYPE_OPERATOR\x10\x05\x12&\n\"ALIAS_TARGET_TYPE_TEST_DESCRIPTION\x10\x06\x12\x1a\n\x16\x41LIAS_TARGET_TYPE_TEST\x10\x07\x12\"\n\x1e\x41LIAS_TARGET_TYPE_TEST_STATION\x10\x08\x12\"\n\x1e\x41LIAS_TARGET_TYPE_TEST_ADAPTER\x10\tB\xb8\x01\n\x1f\x63om.ni.measurements.metadata.v1B\x12MetadataStoreProtoP\x01Z\nmetadatav1\xa2\x02\x04NIMM\xaa\x02,NationalInstruments.Measurements.Metadata.V1\xca\x02\x1bNI\\Measurements\\Metadata\\V1\xea\x02\x1eNI::Measurements::Metadata::V1b\x06proto3')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'ni.measurements.metadata.v1.metadata_store_pb2', globals())
@@ -21,66 +21,66 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\037com.ni.measurements.metadata.v1B\022MetadataStoreProtoP\001Z\nmetadatav1\242\002\004NIMM\252\002,NationalInstruments.Measurements.Metadata.V1\312\002\033NI\\Measurements\\Metadata\\V1\352\002\036NI::Measurements::Metadata::V1'
-  _UUTINSTANCE_EXTENSIONSENTRY._options = None
-  _UUTINSTANCE_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _UUT_EXTENSIONSENTRY._options = None
-  _UUT_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _HARDWAREITEM_EXTENSIONSENTRY._options = None
-  _HARDWAREITEM_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _TESTADAPTER_EXTENSIONSENTRY._options = None
-  _TESTADAPTER_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _SOFTWAREITEM_EXTENSIONSENTRY._options = None
-  _SOFTWAREITEM_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _OPERATOR_EXTENSIONSENTRY._options = None
-  _OPERATOR_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _TESTDESCRIPTION_EXTENSIONSENTRY._options = None
-  _TESTDESCRIPTION_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _TEST_EXTENSIONSENTRY._options = None
-  _TEST_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _TESTSTATION_EXTENSIONSENTRY._options = None
-  _TESTSTATION_EXTENSIONSENTRY._serialized_options = b'8\001'
-  _ALIASTARGETTYPE._serialized_start=3035
-  _ALIASTARGETTYPE._serialized_end=3396
+  _UUTINSTANCE_EXTENSIONENTRY._options = None
+  _UUTINSTANCE_EXTENSIONENTRY._serialized_options = b'8\001'
+  _UUT_EXTENSIONENTRY._options = None
+  _UUT_EXTENSIONENTRY._serialized_options = b'8\001'
+  _HARDWAREITEM_EXTENSIONENTRY._options = None
+  _HARDWAREITEM_EXTENSIONENTRY._serialized_options = b'8\001'
+  _TESTADAPTER_EXTENSIONENTRY._options = None
+  _TESTADAPTER_EXTENSIONENTRY._serialized_options = b'8\001'
+  _SOFTWAREITEM_EXTENSIONENTRY._options = None
+  _SOFTWAREITEM_EXTENSIONENTRY._serialized_options = b'8\001'
+  _OPERATOR_EXTENSIONENTRY._options = None
+  _OPERATOR_EXTENSIONENTRY._serialized_options = b'8\001'
+  _TESTDESCRIPTION_EXTENSIONENTRY._options = None
+  _TESTDESCRIPTION_EXTENSIONENTRY._serialized_options = b'8\001'
+  _TEST_EXTENSIONENTRY._options = None
+  _TEST_EXTENSIONENTRY._serialized_options = b'8\001'
+  _TESTSTATION_EXTENSIONENTRY._options = None
+  _TESTSTATION_EXTENSIONENTRY._serialized_options = b'8\001'
+  _ALIASTARGETTYPE._serialized_start=3008
+  _ALIASTARGETTYPE._serialized_end=3369
   _UUTINSTANCE._serialized_start=82
-  _UUTINSTANCE._serialized_end=431
-  _UUTINSTANCE_EXTENSIONSENTRY._serialized_start=337
-  _UUTINSTANCE_EXTENSIONSENTRY._serialized_end=431
-  _UUT._serialized_start=434
-  _UUT._serialized_end=730
-  _UUT_EXTENSIONSENTRY._serialized_start=337
-  _UUT_EXTENSIONSENTRY._serialized_end=431
-  _HARDWAREITEM._serialized_start=733
-  _HARDWAREITEM._serialized_end=1104
-  _HARDWAREITEM_EXTENSIONSENTRY._serialized_start=337
-  _HARDWAREITEM_EXTENSIONSENTRY._serialized_end=431
-  _TESTADAPTER._serialized_start=1107
-  _TESTADAPTER._serialized_end=1490
-  _TESTADAPTER_EXTENSIONSENTRY._serialized_start=337
-  _TESTADAPTER_EXTENSIONSENTRY._serialized_end=431
-  _SOFTWAREITEM._serialized_start=1493
-  _SOFTWAREITEM._serialized_end=1761
-  _SOFTWAREITEM_EXTENSIONSENTRY._serialized_start=337
-  _SOFTWAREITEM_EXTENSIONSENTRY._serialized_end=431
-  _OPERATOR._serialized_start=1764
-  _OPERATOR._serialized_end=2018
-  _OPERATOR_EXTENSIONSENTRY._serialized_start=337
-  _OPERATOR_EXTENSIONSENTRY._serialized_end=431
-  _TESTDESCRIPTION._serialized_start=2021
-  _TESTDESCRIPTION._serialized_end=2291
-  _TESTDESCRIPTION_EXTENSIONSENTRY._serialized_start=337
-  _TESTDESCRIPTION_EXTENSIONSENTRY._serialized_end=431
-  _TEST._serialized_start=2294
-  _TEST._serialized_end=2547
-  _TEST_EXTENSIONSENTRY._serialized_start=337
-  _TEST_EXTENSIONSENTRY._serialized_end=431
-  _TESTSTATION._serialized_start=2550
-  _TESTSTATION._serialized_end=2822
-  _TESTSTATION_EXTENSIONSENTRY._serialized_start=337
-  _TESTSTATION_EXTENSIONSENTRY._serialized_end=431
-  _EXTENSIONVALUE._serialized_start=2824
-  _EXTENSIONVALUE._serialized_end=2876
-  _EXTENSIONSCHEMA._serialized_start=2878
-  _EXTENSIONSCHEMA._serialized_end=2923
-  _ALIAS._serialized_start=2925
-  _ALIAS._serialized_end=3032
+  _UUTINSTANCE._serialized_end=428
+  _UUTINSTANCE_EXTENSIONENTRY._serialized_start=335
+  _UUTINSTANCE_EXTENSIONENTRY._serialized_end=428
+  _UUT._serialized_start=431
+  _UUT._serialized_end=724
+  _UUT_EXTENSIONENTRY._serialized_start=335
+  _UUT_EXTENSIONENTRY._serialized_end=428
+  _HARDWAREITEM._serialized_start=727
+  _HARDWAREITEM._serialized_end=1095
+  _HARDWAREITEM_EXTENSIONENTRY._serialized_start=335
+  _HARDWAREITEM_EXTENSIONENTRY._serialized_end=428
+  _TESTADAPTER._serialized_start=1098
+  _TESTADAPTER._serialized_end=1478
+  _TESTADAPTER_EXTENSIONENTRY._serialized_start=335
+  _TESTADAPTER_EXTENSIONENTRY._serialized_end=428
+  _SOFTWAREITEM._serialized_start=1481
+  _SOFTWAREITEM._serialized_end=1746
+  _SOFTWAREITEM_EXTENSIONENTRY._serialized_start=335
+  _SOFTWAREITEM_EXTENSIONENTRY._serialized_end=428
+  _OPERATOR._serialized_start=1749
+  _OPERATOR._serialized_end=2000
+  _OPERATOR_EXTENSIONENTRY._serialized_start=335
+  _OPERATOR_EXTENSIONENTRY._serialized_end=428
+  _TESTDESCRIPTION._serialized_start=2003
+  _TESTDESCRIPTION._serialized_end=2270
+  _TESTDESCRIPTION_EXTENSIONENTRY._serialized_start=335
+  _TESTDESCRIPTION_EXTENSIONENTRY._serialized_end=428
+  _TEST._serialized_start=2273
+  _TEST._serialized_end=2523
+  _TEST_EXTENSIONENTRY._serialized_start=335
+  _TEST_EXTENSIONENTRY._serialized_end=428
+  _TESTSTATION._serialized_start=2526
+  _TESTSTATION._serialized_end=2795
+  _TESTSTATION_EXTENSIONENTRY._serialized_start=335
+  _TESTSTATION_EXTENSIONENTRY._serialized_end=428
+  _EXTENSIONVALUE._serialized_start=2797
+  _EXTENSIONVALUE._serialized_end=2849
+  _EXTENSIONSCHEMA._serialized_start=2851
+  _EXTENSIONSCHEMA._serialized_end=2896
+  _ALIAS._serialized_start=2898
+  _ALIAS._serialized_end=3005
 # @@protoc_insertion_point(module_scope)
diff --git a/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.pyi b/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.pyi
index 1dbc9479..38ffc4aa 100644
--- a/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.pyi
+++ b/packages/ni.measurements.metadata.v1.proto/src/ni/measurements/metadata/v1/metadata_store_pb2/__init__.pyi
@@ -58,7 +58,7 @@ class UutInstance(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -82,7 +82,7 @@ class UutInstance(google.protobuf.message.Message):
     FIRMWARE_VERSION_FIELD_NUMBER: builtins.int
     HARDWARE_VERSION_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the UUT instance
@@ -109,13 +109,14 @@ class UutInstance(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the UUT instance is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the UUT instance"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your UutInstance
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -127,10 +128,10 @@ class UutInstance(google.protobuf.message.Message):
         firmware_version: builtins.str = ...,
         hardware_version: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["extensions", b"extensions", "firmware_version", b"firmware_version", "hardware_version", b"hardware_version", "id", b"id", "link", b"link", "manufacture_date", b"manufacture_date", "schema_id", b"schema_id", "serial_number", b"serial_number", "uut_id", b"uut_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["extension", b"extension", "firmware_version", b"firmware_version", "hardware_version", b"hardware_version", "id", b"id", "link", b"link", "manufacture_date", b"manufacture_date", "schema_id", b"schema_id", "serial_number", b"serial_number", "uut_id", b"uut_id"]) -> None: ...
 
 global___UutInstance = UutInstance
 
@@ -141,7 +142,7 @@ class Uut(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -164,7 +165,7 @@ class Uut(google.protobuf.message.Message):
     MANUFACTURERS_FIELD_NUMBER: builtins.int
     PART_NUMBER_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the UUT
@@ -183,17 +184,18 @@ class Uut(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the UUT is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
     def manufacturers(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
         """List of manufacturers of the UUT"""
 
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the UUT"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your Uut
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -204,10 +206,10 @@ class Uut(google.protobuf.message.Message):
         manufacturers: collections.abc.Iterable[builtins.str] | None = ...,
         part_number: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["extensions", b"extensions", "family", b"family", "id", b"id", "link", b"link", "manufacturers", b"manufacturers", "model_name", b"model_name", "part_number", b"part_number", "schema_id", b"schema_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["extension", b"extension", "family", b"family", "id", b"id", "link", b"link", "manufacturers", b"manufacturers", "model_name", b"model_name", "part_number", b"part_number", "schema_id", b"schema_id"]) -> None: ...
 
 global___Uut = Uut
 
@@ -218,7 +220,7 @@ class HardwareItem(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -243,7 +245,7 @@ class HardwareItem(google.protobuf.message.Message):
     ASSET_IDENTIFIER_FIELD_NUMBER: builtins.int
     CALIBRATION_DUE_DATE_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the hardware item
@@ -268,13 +270,14 @@ class HardwareItem(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the hardware item is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the hardware item"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your HardwareItem
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -287,10 +290,10 @@ class HardwareItem(google.protobuf.message.Message):
         asset_identifier: builtins.str = ...,
         calibration_due_date: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "calibration_due_date", b"calibration_due_date", "extensions", b"extensions", "id", b"id", "link", b"link", "manufacturer", b"manufacturer", "model", b"model", "part_number", b"part_number", "schema_id", b"schema_id", "serial_number", b"serial_number"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "calibration_due_date", b"calibration_due_date", "extension", b"extension", "id", b"id", "link", b"link", "manufacturer", b"manufacturer", "model", b"model", "part_number", b"part_number", "schema_id", b"schema_id", "serial_number", b"serial_number"]) -> None: ...
 
 global___HardwareItem = HardwareItem
 
@@ -305,7 +308,7 @@ class TestAdapter(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -331,7 +334,7 @@ class TestAdapter(google.protobuf.message.Message):
     ASSET_IDENTIFIER_FIELD_NUMBER: builtins.int
     CALIBRATION_DUE_DATE_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the test adapter
@@ -358,13 +361,14 @@ class TestAdapter(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the test adapter is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the test adapter"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your TestAdapter
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -378,10 +382,10 @@ class TestAdapter(google.protobuf.message.Message):
         asset_identifier: builtins.str = ...,
         calibration_due_date: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "calibration_due_date", b"calibration_due_date", "extensions", b"extensions", "id", b"id", "link", b"link", "manufacturer", b"manufacturer", "model", b"model", "name", b"name", "part_number", b"part_number", "schema_id", b"schema_id", "serial_number", b"serial_number"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "calibration_due_date", b"calibration_due_date", "extension", b"extension", "id", b"id", "link", b"link", "manufacturer", b"manufacturer", "model", b"model", "name", b"name", "part_number", b"part_number", "schema_id", b"schema_id", "serial_number", b"serial_number"]) -> None: ...
 
 global___TestAdapter = TestAdapter
 
@@ -392,7 +396,7 @@ class SoftwareItem(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -413,7 +417,7 @@ class SoftwareItem(google.protobuf.message.Message):
     PRODUCT_FIELD_NUMBER: builtins.int
     VERSION_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the software item
@@ -435,13 +439,14 @@ class SoftwareItem(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the software item is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the software item"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your SoftwareItem
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -450,10 +455,10 @@ class SoftwareItem(google.protobuf.message.Message):
         product: builtins.str = ...,
         version: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["extensions", b"extensions", "id", b"id", "link", b"link", "product", b"product", "schema_id", b"schema_id", "version", b"version"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["extension", b"extension", "id", b"id", "link", b"link", "product", b"product", "schema_id", b"schema_id", "version", b"version"]) -> None: ...
 
 global___SoftwareItem = SoftwareItem
 
@@ -464,7 +469,7 @@ class Operator(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -485,7 +490,7 @@ class Operator(google.protobuf.message.Message):
     NAME_FIELD_NUMBER: builtins.int
     ROLE_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the operator
@@ -502,13 +507,14 @@ class Operator(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the operator is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the operator"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your Operator
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -517,10 +523,10 @@ class Operator(google.protobuf.message.Message):
         name: builtins.str = ...,
         role: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["extensions", b"extensions", "id", b"id", "link", b"link", "name", b"name", "role", b"role", "schema_id", b"schema_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["extension", b"extension", "id", b"id", "link", b"link", "name", b"name", "role", b"role", "schema_id", b"schema_id"]) -> None: ...
 
 global___Operator = Operator
 
@@ -531,7 +537,7 @@ class TestDescription(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -552,7 +558,7 @@ class TestDescription(google.protobuf.message.Message):
     UUT_ID_FIELD_NUMBER: builtins.int
     NAME_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the test description
@@ -569,13 +575,14 @@ class TestDescription(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the test description is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the test description"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your TestDescription
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -584,10 +591,10 @@ class TestDescription(google.protobuf.message.Message):
         uut_id: builtins.str = ...,
         name: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["extensions", b"extensions", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id", "uut_id", b"uut_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["extension", b"extension", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id", "uut_id", b"uut_id"]) -> None: ...
 
 global___TestDescription = TestDescription
 
@@ -598,7 +605,7 @@ class Test(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -619,7 +626,7 @@ class Test(google.protobuf.message.Message):
     NAME_FIELD_NUMBER: builtins.int
     DESCRIPTION_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the test
@@ -636,13 +643,14 @@ class Test(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the test is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the test"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your Test
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -651,10 +659,10 @@ class Test(google.protobuf.message.Message):
         name: builtins.str = ...,
         description: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["description", b"description", "extensions", b"extensions", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["description", b"description", "extension", b"extension", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id"]) -> None: ...
 
 global___Test = Test
 
@@ -665,7 +673,7 @@ class TestStation(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     @typing.final
-    class ExtensionsEntry(google.protobuf.message.Message):
+    class ExtensionEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
         KEY_FIELD_NUMBER: builtins.int
@@ -686,7 +694,7 @@ class TestStation(google.protobuf.message.Message):
     NAME_FIELD_NUMBER: builtins.int
     ASSET_IDENTIFIER_FIELD_NUMBER: builtins.int
     LINK_FIELD_NUMBER: builtins.int
-    EXTENSIONS_FIELD_NUMBER: builtins.int
+    EXTENSION_FIELD_NUMBER: builtins.int
     SCHEMA_ID_FIELD_NUMBER: builtins.int
     id: builtins.str
     """The unique identifier of the test station
@@ -703,13 +711,14 @@ class TestStation(google.protobuf.message.Message):
     """
     schema_id: builtins.str
     """The unique identifier of the schema that applies to this instance's extension.
-    If any extension is associated with this instance, a schema_id must be provided, unless
-    the test station is created within the context of a test result, in which case
-    the test result must have a schema_id.
+    If any extension is associated with this instance, a schema_id must be provided.
     """
     @property
-    def extensions(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
-        """Any extensions to be associated with the test station"""
+    def extension(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___ExtensionValue]:
+        """Optional. Any attributes used to extend the definition of your TestStation
+        can go here. To add extension attributes, you must first register a schema,
+        and specify the schema's id in the 'schema_id' field.
+        """
 
     def __init__(
         self,
@@ -718,10 +727,10 @@ class TestStation(google.protobuf.message.Message):
         name: builtins.str = ...,
         asset_identifier: builtins.str = ...,
         link: builtins.str = ...,
-        extensions: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
+        extension: collections.abc.Mapping[builtins.str, global___ExtensionValue] | None = ...,
         schema_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "extensions", b"extensions", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["asset_identifier", b"asset_identifier", "extension", b"extension", "id", b"id", "link", b"link", "name", b"name", "schema_id", b"schema_id"]) -> None: ...
 
 global___TestStation = TestStation
 
diff --git a/third_party/ni-apis b/third_party/ni-apis
index 99fcc827..f22cdcd8 160000
--- a/third_party/ni-apis
+++ b/third_party/ni-apis
@@ -1 +1 @@
-Subproject commit 99fcc827372573ddeea8d3261699603fe9082b0a
+Subproject commit f22cdcd8888d8117c555e79ac811caaabd7b0b51