diff --git a/yaml/xyz/openbmc_project/Logging.events.yaml b/yaml/xyz/openbmc_project/Logging.events.yaml
index e582c38..4fc20d9 100644
--- a/yaml/xyz/openbmc_project/Logging.events.yaml
+++ b/yaml/xyz/openbmc_project/Logging.events.yaml
@@ -1,4 +1,4 @@
-version: 1.0.0
+version: 1.0.1
 
 events:
     - name: Cleared
@@ -6,6 +6,6 @@
           description: Indicate the user cleared all logs.
           message: Event log cleared by user.
       metadata:
-          - name: NUMBER_OF_LOGS
+          - name: NumberOfLogs
             description: The number of logs present before clearing.
             type: uint64
diff --git a/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml b/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
index af9a958..00c8d31 100644
--- a/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
+++ b/yaml/xyz/openbmc_project/Sensor/Threshold.events.yaml
@@ -1,11 +1,11 @@
-version: 1.0.0
+version: 1.0.1
 
 errors:
     - name: InvalidSensorReading
       severity: warning
       errno: EIO
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
@@ -15,19 +15,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -37,19 +37,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -59,19 +59,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -81,19 +81,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -103,19 +103,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -125,19 +125,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -147,19 +147,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -169,19 +169,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -191,19 +191,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -213,19 +213,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -235,19 +235,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -257,19 +257,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -279,19 +279,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -301,19 +301,19 @@
       severity: warning
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -323,19 +323,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -345,19 +345,19 @@
       severity: critical
       errno: ERANGE
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
-          - name: THRESHOLD_VALUE
+          - name: ThresholdValue
             description: The configured threshold value for this sensor.
             type: double
             primary: true
@@ -367,7 +367,7 @@
       severity: critical
       errno: EIO
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
@@ -376,15 +376,15 @@
 events:
     - name: SensorReadingNormalRange
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true
-          - name: READING_VALUE
+          - name: ReadingValue
             description: The reading of the sensor.
             type: double
             primary: true
-          - name: UNITS
+          - name: Units
             description: The reading units of measure.
             type: enum[xyz.openbmc_project.Sensor.Value.Unit]
             primary: true
@@ -392,7 +392,7 @@
 
     - name: SensorRestored
       metadata:
-          - name: SENSOR_NAME
+          - name: SensorName
             description: The name or identifier of the sensor.
             type: object_path
             primary: true