diff --git a/static/redfish/v1/JsonSchemas/Power/Power.json b/static/redfish/v1/JsonSchemas/Power/Power.json
index 7a55e97..576c476 100644
--- a/static/redfish/v1/JsonSchemas/Power/Power.json
+++ b/static/redfish/v1/JsonSchemas/Power/Power.json
@@ -1,15 +1,15 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_5_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_5_4.json",
     "$ref": "#/definitions/Power",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2018 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
+            "description": "The available actions for this Resource.",
+            "longDescription": "This type shall contain the available actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -25,8 +25,8 @@
             "properties": {
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
-                    "description": "This property contains the available OEM specific actions for this resource.",
-                    "longDescription": "This property shall contain any additional OEM actions for this resource.",
+                    "description": "The available OEM-specific actions for this Resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 }
             },
@@ -35,9 +35,9 @@
         "InputRange": {
             "additionalProperties": false,
             "description": "This type describes an input range for a power supply.",
-            "longDescription": "This type shall describe an input range that the associated power supply is able to utilize.",
+            "longDescription": "This type shall describe an input range that the associated power supply can utilize.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -67,7 +67,7 @@
                 },
                 "MaximumFrequencyHz": {
                     "description": "The maximum line input frequency at which this power supply input range is effective.",
-                    "longDescription": "This property shall contain the value in Hertz of the maximum line input frequency which the power supply is capable of consuming for this range.",
+                    "longDescription": "This property shall contain the value, in Hertz, of the maximum line input frequency that the power supply is capable of consuming for this range.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -79,7 +79,7 @@
                 },
                 "MaximumVoltage": {
                     "description": "The maximum line input voltage at which this power supply input range is effective.",
-                    "longDescription": "This property shall contain the value in Volts of the maximum line input voltage which the power supply is capable of consuming for this range.",
+                    "longDescription": "This property shall contain the value, in volts, of the maximum line input voltage that the power supply is capable of consuming for this range.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -90,7 +90,7 @@
                 },
                 "MinimumFrequencyHz": {
                     "description": "The minimum line input frequency at which this power supply input range is effective.",
-                    "longDescription": "This property shall contain the value in Hertz of the minimum line input frequency which the power supply is capable of consuming for this range.",
+                    "longDescription": "This property shall contain the value, in Hertz, of the minimum line input frequency that the power supply is capable of consuming for this range.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -102,7 +102,7 @@
                 },
                 "MinimumVoltage": {
                     "description": "The minimum line input voltage at which this power supply input range is effective.",
-                    "longDescription": "This property shall contain the value in Volts of the minimum line input voltage which the power supply is capable of consuming for this range.",
+                    "longDescription": "This property shall contain the value, in volts, of the minimum line input voltage that the power supply is capable of consuming for this range.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -113,13 +113,13 @@
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "Oem extension object.",
-                    "longDescription": "This object represents the Oem property.  All values for resources described by this schema shall comply to the requirements as described in the Redfish specification.",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements.",
                     "versionAdded": "v1_1_0"
                 },
                 "OutputWattage": {
-                    "description": "The maximum capacity of this Power Supply when operating in this input range.",
-                    "longDescription": "This property shall contiain the maximum amount of power, in Watts, that the associated power supply is rated to deliver while operating in this input range.",
+                    "description": "The maximum capacity of this power supply when operating in this input range.",
+                    "longDescription": "This property shall contain the maximum amount of power, in watts, that the associated power supply is rated to deliver while operating in this input range.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -159,9 +159,9 @@
                 "DC240V"
             ],
             "enumDeprecated": {
-                "ACHighLine": "This value has been Deprecated in favor of AC277V.",
-                "ACLowLine": "This value has been Deprecated in favor of AC120V.",
-                "ACMidLine": "This value has been Deprecated in favor of AC240V."
+                "ACHighLine": "This value has been deprecated in favor of AC277V.",
+                "ACLowLine": "This value has been deprecated in favor of AC120V.",
+                "ACMidLine": "This value has been deprecated in favor of AC240V."
             },
             "enumDescriptions": {
                 "AC120V": "AC 120V nominal input.",
@@ -194,10 +194,10 @@
         },
         "OemActions": {
             "additionalProperties": true,
-            "description": "The available OEM specific actions for this resource.",
-            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "description": "The available OEM-specific actions for this Resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -215,10 +215,10 @@
         },
         "Power": {
             "additionalProperties": false,
-            "description": "This is the schema definition for the Power Metrics.  It represents the properties for Power Consumption and Power Limiting.",
-            "longDescription": "This resource shall be used to represent a power metrics resource for a Redfish implementation.",
+            "description": "The Power schema describes power metrics and represents the properties for power consumption and power limiting.",
+            "longDescription": "This Resource contains a Power Metrics Resource for a Redfish implementation.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -233,21 +233,21 @@
             },
             "properties": {
                 "@odata.context": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
                 },
                 "@odata.etag": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
                 },
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "@odata.type": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "The Actions property shall contain the available actions for this resource.",
+                    "description": "The available actions for this Resource.",
+                    "longDescription": "This property shall contain the available actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 },
                 "Description": {
@@ -271,56 +271,56 @@
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
-                    "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PowerControl": {
                     "autoExpand": true,
-                    "description": "This is the definition for power control function (power reading/limiting).",
+                    "description": "The set of power control functions, including power reading and limiting.",
                     "items": {
                         "$ref": "#/definitions/PowerControl"
                     },
-                    "longDescription": "These properties shall be the definition for power control (power reading and limiting) for a Redfish implementation.",
+                    "longDescription": "This property shall contain the set of power control readings and settings.",
                     "type": "array"
                 },
                 "PowerControl@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "PowerSupplies": {
                     "autoExpand": true,
-                    "description": "Details of the power supplies associated with this system or device.",
+                    "description": "The set of power supplies associated with this system or device.",
                     "items": {
                         "$ref": "#/definitions/PowerSupply"
                     },
-                    "longDescription": "This object shall contain details of the power supplies associated with this system or device.",
+                    "longDescription": "This property shall contain the set of power supplies associated with this system or device.",
                     "type": "array"
                 },
                 "PowerSupplies@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Redundancy": {
                     "autoExpand": true,
-                    "description": "Redundancy information for the power subsystem of this system or device.",
+                    "description": "The redundancy information for the set of power supplies in this chassis.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/Redundancy"
                     },
-                    "longDescription": "This property shall contain redundancy information for the power subsystem of this system or device.",
+                    "longDescription": "This property shall contain redundancy information for the set of power supplies in this system or device.",
                     "type": "array"
                 },
                 "Redundancy@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Voltages": {
                     "autoExpand": true,
-                    "description": "This is the definition for voltage sensors.",
+                    "description": "The set of voltage sensors for this chassis.",
                     "items": {
                         "$ref": "#/definitions/Voltage"
                     },
-                    "longDescription": "These properties shall be the definition for voltage sensors for a Redfish implementation.",
+                    "longDescription": "This property shall contain the set of voltage sensors for this chassis.",
                     "type": "array"
                 },
                 "Voltages@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 }
             },
             "required": [
@@ -334,7 +334,7 @@
         "PowerControl": {
             "additionalProperties": false,
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -349,23 +349,23 @@
             },
             "properties": {
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "Actions": {
                     "$ref": "#/definitions/PowerControlActions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "The Actions property shall contain the available actions for this resource.",
+                    "description": "The available actions for this Resource.",
+                    "longDescription": "This property shall contain the available actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 },
                 "MemberId": {
-                    "description": "This is the identifier for the member within the collection.",
-                    "longDescription": "The value of this string shall uniquely identify the member within the collection.",
+                    "description": "The identifier for the member within the collection.",
+                    "longDescription": "This property shall uniquely identify the member within the collection.  For services supporting Redfish v1.6 or higher, this value shall contain the zero-based array index.",
                     "readonly": true,
                     "type": "string"
                 },
                 "Name": {
-                    "description": "Power Control Function name.",
-                    "longDescription": "The value of this property shall be the name of the Voltage sensor.",
+                    "description": "The power control function name.",
+                    "longDescription": "This property shall contain the name of the power control function name.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -374,19 +374,19 @@
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
-                    "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PhysicalContext": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext",
-                    "description": "Describes the area, device, or set of devices to which this power control applies.",
-                    "longDescription": "The value of this property shall be a description of the affected device(s) or region within the chassis to which this power control applies.",
+                    "description": "The area, device, or set of devices to which this power control applies.",
+                    "longDescription": "This property shall contain a description of the affected device(s) or region within the chassis to which this power control applies.",
                     "readonly": true,
                     "versionAdded": "v1_4_0"
                 },
                 "PowerAllocatedWatts": {
-                    "description": "The total amount of power that has been allocated (or budegeted)to  chassis resources.",
-                    "longDescription": "The value of this property shall represent the total power currently allocated to chassis resources.",
+                    "description": "The total amount of power that has been allocated or budgeted to chassis.",
+                    "longDescription": "This property shall represent the total power currently allocated or budgeted to the chassis.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -396,8 +396,8 @@
                     "units": "W"
                 },
                 "PowerAvailableWatts": {
-                    "description": "The amount of power not already budgeted and therefore available for additional allocation. (powerCapacity - powerAllocated).  This indicates how much reserve power capacity is left.",
-                    "longDescription": "The value of this property shall represent the amount of power capacity (in Watts) not already allocated and shall equal PowerCapacityWatts - PowerAllocatedWatts.",
+                    "description": "The amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value.",
+                    "longDescription": "This property shall represent the amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -407,8 +407,8 @@
                     "units": "W"
                 },
                 "PowerCapacityWatts": {
-                    "description": "The total amount of power available to the chassis for allocation. This may the power supply capacity, or power budget assigned to the chassis from an up-stream chassis.",
-                    "longDescription": "The value of this property shall represent the total power capacity that is available for allocation to the chassis resources.",
+                    "description": "The total amount of power that can be allocated to the chassis.  This value can be either the power supply capacity or the power budget that an upstream chassis assigns to this chassis.",
+                    "longDescription": "This property shall represent the total power capacity that can be allocated to the chassis.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -418,8 +418,8 @@
                     "units": "W"
                 },
                 "PowerConsumedWatts": {
-                    "description": "The actual power being consumed by the chassis.",
-                    "longDescription": "The value of this property shall represent the actual power being consumed (in Watts) by the chassis.",
+                    "description": "The actual power that the chassis consumes, in watts.",
+                    "longDescription": "This property shall represent the actual power that the chassis consumes, in watts.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -430,17 +430,17 @@
                 },
                 "PowerLimit": {
                     "$ref": "#/definitions/PowerLimit",
-                    "description": "Power limit status and configuration information for this chassis.",
-                    "longDescription": "This object shall contain power limit status and configuration information for this chassis."
+                    "description": "The power limit status and configuration information for this chassis.",
+                    "longDescription": "This property shall contain power limit status and configuration information for this chassis."
                 },
                 "PowerMetrics": {
                     "$ref": "#/definitions/PowerMetric",
-                    "description": "Power readings for this chassis.",
-                    "longDescription": "This object shall contain power metrics for power readings (interval, minimum/maximum/average power consumption) for the chassis."
+                    "description": "The power readings for this chassis.",
+                    "longDescription": "This property shall contain power metrics for power readings, such as interval, minimum, maximum, and average power consumption, for the chassis."
                 },
                 "PowerRequestedWatts": {
-                    "description": "The potential power that the chassis resources are requesting which may be higher than the current level being consumed since requested power includes budget that the chassis resource wants for future use.",
-                    "longDescription": "The value of this property shall represent the amount of power (in Watts) that the chassis resource is currently requesting be budgeted to it for future use.",
+                    "description": "The potential power, in watts, that the chassis requests, which may be higher than the current level being consumed because the requested power includes a budget that the chassis wants for future use.",
+                    "longDescription": "This property shall represent the amount of power, in watts, that the chassis currently requests to be budgeted for future use.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -450,21 +450,21 @@
                     "units": "W"
                 },
                 "RelatedItem": {
-                    "description": "The ID(s) of the resources associated with this Power Limit.",
+                    "description": "An array of one or more IDs of the Resources associated with this power limit.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/idRef"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
-                    "longDescription": "The value of this property shall be an array of IDs containing pointers consistent with JSON pointer syntax to the resource that is being limited.",
+                    "longDescription": "This property shall contain an array of IDs for pointers consistent with JSON Pointer syntax to the Resource that is being limited.",
                     "readonly": true,
                     "type": "array"
                 },
                 "RelatedItem@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "This property describes the status and health of the resource and its children.",
-                    "longDescription": "This property shall contain any status or health properties of the resource."
+                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
+                    "longDescription": "This property shall contain any status or health properties of the Resource."
                 }
             },
             "required": [
@@ -475,10 +475,10 @@
         },
         "PowerControlActions": {
             "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
+            "description": "The available actions for this Resource.",
+            "longDescription": "This type shall contain the available actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -494,8 +494,8 @@
             "properties": {
                 "Oem": {
                     "$ref": "#/definitions/PowerControlOemActions",
-                    "description": "This property contains the available OEM specific actions for this resource.",
-                    "longDescription": "This property shall contain any additional OEM actions for this resource.",
+                    "description": "The available OEM-specific actions for this Resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 }
             },
@@ -503,10 +503,10 @@
         },
         "PowerControlOemActions": {
             "additionalProperties": true,
-            "description": "The available OEM specific actions for this resource.",
-            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "description": "The available OEM-specific actions for this Resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -524,10 +524,10 @@
         },
         "PowerLimit": {
             "additionalProperties": false,
-            "description": "This object contains power limit status and configuration information for the chassis.",
+            "description": "The power limit status and configuration information for the chassis.",
             "longDescription": "This type shall contain power limit status and configuration information for this chassis.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -543,7 +543,7 @@
             "properties": {
                 "CorrectionInMs": {
                     "description": "The time required for the limiting process to reduce power consumption to below the limit.",
-                    "longDescription": "The value of this property shall represent the time interval in ms required for the limiting process to react and reduce the power consumption below the limit.",
+                    "longDescription": "This property shall represent the time interval in ms required for the limiting process to react and reduce the power consumption below the limit.",
                     "readonly": false,
                     "type": [
                         "integer",
@@ -561,12 +561,12 @@
                         }
                     ],
                     "description": "The action that is taken if the power cannot be maintained below the LimitInWatts.",
-                    "longDescription": "The value of this property shall represent the action to be taken if the resource power consumption can not be limited below the specified limit after several correction time periods.",
+                    "longDescription": "This property shall represent the action to be taken if the Resource power consumption cannot be limited below the specified limit after several correction time periods.",
                     "readonly": false
                 },
                 "LimitInWatts": {
-                    "description": "The Power limit in watts. Set to null to disable power capping.",
-                    "longDescription": "The value of this property shall represent the power cap limit in watts for the resource.  If set to null, power capping shall be disabled.",
+                    "description": "The power limit, in watts.  If `null`, power capping is disabled.",
+                    "longDescription": "This property shall represent the power capping limit, in watts, for the Resource.  If `null`, power capping shall be disabled.",
                     "minimum": 0,
                     "readonly": false,
                     "type": [
@@ -595,10 +595,10 @@
         },
         "PowerMetric": {
             "additionalProperties": false,
-            "description": "This type describe the power metrics for a resource.",
-            "longDescription": "This type shall contain power metrics for power readings (interval, minimum/maximum/average power consumption) for a resource.",
+            "description": "The power metrics for a Resource.",
+            "longDescription": "This type shall contain power metrics for power readings, such as interval, minimum, maximum, and average power consumption, for a Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -613,8 +613,8 @@
             },
             "properties": {
                 "AverageConsumedWatts": {
-                    "description": "The average power level over the measurement window (the last IntervalInMin minutes).",
-                    "longDescription": "The value of this property shall represent the average power level that occured averaged over the last IntervalInMin minutes.",
+                    "description": "The average power level over the measurement window over the last IntervalInMin minutes.",
+                    "longDescription": "This property shall represent the average power level that occurred over the last IntervalInMin minutes.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -624,8 +624,8 @@
                     "units": "W"
                 },
                 "IntervalInMin": {
-                    "description": "The time interval (or window) in which the PowerMetrics are measured over.",
-                    "longDescription": "The value of this property shall represent the time interval (or window), in minutes, in which the PowerMetrics properties are measured over.",
+                    "description": "The time interval, or window, over which the power metrics are measured.",
+                    "longDescription": "This property shall represent the time interval or window, in minutes, over which the power metrics are measured.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -635,8 +635,8 @@
                     "units": "min"
                 },
                 "MaxConsumedWatts": {
-                    "description": "The highest power consumption level that has occured over the measurement window (the last IntervalInMin minutes).",
-                    "longDescription": "The value of this property shall represent the maximum power level in watts that occured within the last IntervalInMin minutes.",
+                    "description": "The highest power consumption level, in watts, that has occurred over the measurement window within the last IntervalInMin minutes.",
+                    "longDescription": "This property shall represent the maximum power level, in watts, that occurred within the last IntervalInMin minutes.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -646,8 +646,8 @@
                     "units": "W"
                 },
                 "MinConsumedWatts": {
-                    "description": "The lowest power consumption level over the measurement window (the last IntervalInMin minutes).",
-                    "longDescription": "The value of this property shall represent the minimum power level in watts that occured within the last IntervalInMin minutes.",
+                    "description": "The lowest power consumption level, in watts, over the measurement window that occurred within the last IntervalInMin minutes.",
+                    "longDescription": "This property shall represent the minimum power level, in watts, that occurred within the last IntervalInMin minutes.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -663,7 +663,7 @@
             "additionalProperties": false,
             "description": "Details of a power supplies associated with this system or device.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -678,24 +678,24 @@
             },
             "properties": {
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "Actions": {
                     "$ref": "#/definitions/PowerSupplyActions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "The Actions property shall contain the available actions for this resource.",
+                    "description": "The available actions for this Resource.",
+                    "longDescription": "This property shall contain the available actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 },
                 "Assembly": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Assembly.json#/definitions/Assembly",
-                    "description": "A reference to the Assembly resource associated with this power supply.",
-                    "longDescription": "The value of this property shall be a link to a resource of type Assembly.",
+                    "description": "The link to the assembly Resource associated with this power supply.",
+                    "longDescription": "This property shall contain a link to a Resource of type assembly.",
                     "readonly": true,
                     "versionAdded": "v1_5_0"
                 },
                 "EfficiencyPercent": {
-                    "description": "The measured efficiency of this Power Supply as a percentage.",
-                    "longDescription": "This property shall contain the value of the measured power efficiency, as a percentage, of the associated power supply.",
+                    "description": "The measured efficiency of this power supply as a percentage.",
+                    "longDescription": "This property shall contain the measured power efficiency, as a percentage, of the associated power supply.",
                     "maximum": 100,
                     "minimum": 0,
                     "readonly": true,
@@ -707,7 +707,7 @@
                     "versionAdded": "v1_5_0"
                 },
                 "FirmwareVersion": {
-                    "description": "The firmware version for this Power Supply.",
+                    "description": "The firmware version for this power supply.",
                     "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -716,8 +716,8 @@
                     ]
                 },
                 "HotPluggable": {
-                    "description": "Indicates if this device can be inserted or removed while the equipment is in operation.",
-                    "longDescription": "The value of this property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Devices indicated as hot-pluggable shall allow the device to become operable without altering the operational state of the underlying equipment. Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be indicated as not hot-pluggable.",
+                    "description": "An indication of whether this device can be inserted or removed while the equipment is in operation.",
+                    "longDescription": "This property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Devices indicated as hot-pluggable shall allow the device to become operable without altering the operational state of the underlying equipment.  Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be indicated as not hot-pluggable.",
                     "readonly": true,
                     "type": [
                         "boolean",
@@ -734,23 +734,23 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The state of the indicator LED, used to identify the power supply.",
-                    "longDescription": "The value of this property shall contain the indicator light state for the indicator light associated with this power supply.",
+                    "description": "The state of The indicator LED, which identifies the power supply.",
+                    "longDescription": "This property shall contain the indicator light state for the indicator light associated with this power supply.",
                     "readonly": false,
                     "versionAdded": "v1_2_0"
                 },
                 "InputRanges": {
-                    "description": "This is the input ranges that the power supply can use.",
+                    "description": "The input ranges that the power supply can use.",
                     "items": {
                         "$ref": "#/definitions/InputRange"
                     },
-                    "longDescription": "The value of this property shall be a collection of ranges usable by the power supply unit.",
+                    "longDescription": "This property shall contain a collection of ranges usable by the power supply unit.",
                     "type": "array",
                     "versionAdded": "v1_1_0"
                 },
                 "LastPowerOutputWatts": {
-                    "description": "The average power output of this Power Supply.",
-                    "longDescription": "This property shall contain the average power output, measured in Watts, of the associated power supply.",
+                    "description": "The average power output of this power supply.",
+                    "longDescription": "This property shall contain the average power output, measured in watts, of the associated power supply.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -760,7 +760,7 @@
                     "units": "W"
                 },
                 "LineInputVoltage": {
-                    "description": "The line input voltage at which the Power Supply is operating.",
+                    "description": "The line input voltage at which the power supply is operating.",
                     "longDescription": "This property shall contain the value in Volts of the line input voltage (measured or configured for) that the power supply has been configured to operate with or is currently receiving.",
                     "readonly": true,
                     "type": [
@@ -778,19 +778,19 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The line voltage type supported as an input to this Power Supply.",
+                    "description": "The line voltage type supported as an input to this power supply.",
                     "longDescription": "This property shall contain the type of input line voltage supported by the associated power supply.",
                     "readonly": true
                 },
                 "Location": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
-                    "description": "The Location of the power supply.",
+                    "description": "The location of the power supply.",
                     "longDescription": "This property shall contain location information of the associated power supply.",
                     "versionAdded": "v1_5_0"
                 },
                 "Manufacturer": {
-                    "description": "This is the manufacturer of this power supply.",
-                    "longDescription": "The value of this property shall be the name of the organization responsible for producing the power supply. This organization might be the entity from whom the power supply is purchased, but this is not necessarily true.",
+                    "description": "The manufacturer of this power supply.",
+                    "longDescription": "This property shall contain the name of the organization responsible for producing the power supply.  This organization might be the entity from whom the power supply is purchased, but this is not necessarily true.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -799,13 +799,13 @@
                     "versionAdded": "v1_1_0"
                 },
                 "MemberId": {
-                    "description": "This is the identifier for the member within the collection.",
-                    "longDescription": "The value of this string shall uniquely identify the member within the collection.",
+                    "description": "The identifier for the member within the collection.",
+                    "longDescription": "This property shall uniquely identify the member within the collection.  For services supporting Redfish v1.6 or higher, this value shall contain the zero-based array index.",
                     "readonly": true,
                     "type": "string"
                 },
                 "Model": {
-                    "description": "The model number for this Power Supply.",
+                    "description": "The model number for this power supply.",
                     "longDescription": "This property shall contain the model information as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -814,7 +814,7 @@
                     ]
                 },
                 "Name": {
-                    "description": "The name of the Power Supply.",
+                    "description": "The name of the power supply.",
                     "longDescription": "This property shall contain a descriptive name for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -824,11 +824,11 @@
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
-                    "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PartNumber": {
-                    "description": "The part number for this Power Supply.",
+                    "description": "The part number for this power supply.",
                     "longDescription": "This property shall contain the part number as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -837,8 +837,8 @@
                     ]
                 },
                 "PowerCapacityWatts": {
-                    "description": "The maximum capacity of this Power Supply.",
-                    "longDescription": "This property shall contiain the maximum amount of power, in Watts, that the associated power supply is rated to deliver.",
+                    "description": "The maximum capacity of this power supply.",
+                    "longDescription": "This property shall contain the maximum amount of power, in watts, that the associated power supply is rated to deliver.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -848,8 +848,8 @@
                     "units": "W"
                 },
                 "PowerInputWatts": {
-                    "description": "The measured input power of this Power Supply.",
-                    "longDescription": "This property shall contain the value of the measured input power, in Watts, of the associated power supply.",
+                    "description": "The measured input power of this power supply.",
+                    "longDescription": "This property shall contain the measured input power, in watts, of the associated power supply.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -860,8 +860,8 @@
                     "versionAdded": "v1_5_0"
                 },
                 "PowerOutputWatts": {
-                    "description": "The measured output power of this Power Supply.",
-                    "longDescription": "This property shall contain the value of the measured output power, in Watts, of the associated power supply.",
+                    "description": "The measured output power of this power supply.",
+                    "longDescription": "This property shall contain the measured output power, in watts, of the associated power supply.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -880,34 +880,34 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The Power Supply type (AC or DC).",
+                    "description": "The power supply type (AC or DC).",
                     "longDescription": "This property shall contain the input power type (AC or DC) of the associated power supply.",
                     "readonly": true
                 },
                 "Redundancy": {
-                    "description": "This structure is used to show redundancy for power supplies.  The Component ids will reference the members of the redundancy groups.",
+                    "description": "The set of redundancy groups for this power supply.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/Redundancy"
                     },
-                    "longDescription": "The values of the properties in this array shall be used to show redundancy for power supplies and other elements in this resource.  The use of IDs within these arrays shall reference the members of the redundancy groups.",
+                    "longDescription": "This property shall contain an array of links to the redundancy groups to which this power supply belongs.",
                     "type": "array"
                 },
                 "Redundancy@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "RelatedItem": {
-                    "description": "The ID(s) of the resources associated with this Power Limit.",
+                    "description": "The ID(s) of the Resources associated with this power limit.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/idRef"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
-                    "longDescription": "The value of this property shall be an array of IDs containing pointers consistent with JSON pointer syntax to the resource that is being limited.",
+                    "longDescription": "This property shall contain an array of IDs for pointers consistent with JSON Pointer syntax to the Resource that is being limited.",
                     "type": "array"
                 },
                 "RelatedItem@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "SerialNumber": {
-                    "description": "The serial number for this Power Supply.",
+                    "description": "The serial number for this power supply.",
                     "longDescription": "This property shall contain the serial number as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -916,7 +916,7 @@
                     ]
                 },
                 "SparePartNumber": {
-                    "description": "The spare part number for this Power Supply.",
+                    "description": "The spare part number for this power supply.",
                     "longDescription": "This property shall contain the spare or replacement part number as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
@@ -926,8 +926,8 @@
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "This property describes the status and health of the resource and its children.",
-                    "longDescription": "This property shall contain any status or health properties of the resource."
+                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
+                    "longDescription": "This property shall contain any status or health properties of the Resource."
                 }
             },
             "required": [
@@ -938,10 +938,10 @@
         },
         "PowerSupplyActions": {
             "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
+            "description": "The available actions for this Resource.",
+            "longDescription": "This type shall contain the available actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -957,8 +957,8 @@
             "properties": {
                 "Oem": {
                     "$ref": "#/definitions/PowerSupplyOemActions",
-                    "description": "This property contains the available OEM specific actions for this resource.",
-                    "longDescription": "This property shall contain any additional OEM actions for this resource.",
+                    "description": "The available OEM-specific actions for this Resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 }
             },
@@ -966,10 +966,10 @@
         },
         "PowerSupplyOemActions": {
             "additionalProperties": true,
-            "description": "The available OEM specific actions for this resource.",
-            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "description": "The available OEM-specific actions for this Resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -994,7 +994,7 @@
             ],
             "enumDescriptions": {
                 "AC": "Alternating Current (AC) power supply.",
-                "ACorDC": "Power Supply supports both DC or AC.",
+                "ACorDC": "The power supply supports both DC or AC.",
                 "DC": "Direct Current (DC) power supply.",
                 "Unknown": "The power supply type cannot be determined."
             },
@@ -1003,7 +1003,7 @@
         "Voltage": {
             "additionalProperties": false,
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -1018,17 +1018,17 @@
             },
             "properties": {
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "Actions": {
                     "$ref": "#/definitions/VoltageActions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "The Actions property shall contain the available actions for this resource.",
+                    "description": "The available actions for this Resource.",
+                    "longDescription": "This property shall contain the available actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 },
                 "LowerThresholdCritical": {
-                    "description": "Below normal range but not yet fatal.",
-                    "longDescription": "The value of this property shall indicate the present reading is below the normal range but is not yet fatal. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is below normal range but not yet fatal.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is below the normal range but is not yet fatal.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1037,8 +1037,8 @@
                     "units": "V"
                 },
                 "LowerThresholdFatal": {
-                    "description": "Below normal range and is fatal.",
-                    "longDescription": "The value of this property shall indicate the present reading is below the normal range and is fatal. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is below normal range and fatal.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is below the normal range and is fatal.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1047,8 +1047,8 @@
                     "units": "V"
                 },
                 "LowerThresholdNonCritical": {
-                    "description": "Below normal range.",
-                    "longDescription": "The value of this property shall indicate the present reading is below the normal range but is not critical. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is below normal range.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is below normal range.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1057,8 +1057,8 @@
                     "units": "V"
                 },
                 "MaxReadingRange": {
-                    "description": "Maximum value for this Voltage sensor.",
-                    "longDescription": "The value of this property shall indicate the highest possible value for ReadingVolts. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "Maximum value for this sensor.",
+                    "longDescription": "This property shall indicate the highest possible value for the ReadingVolts property.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1067,14 +1067,14 @@
                     "units": "V"
                 },
                 "MemberId": {
-                    "description": "This is the identifier for the member within the collection.",
-                    "longDescription": "The value of this string shall uniquely identify the member within the collection.",
+                    "description": "The identifier for the member within the collection.",
+                    "longDescription": "This property shall uniquely identify the member within the collection.  For services supporting Redfish v1.6 or higher, this value shall contain the zero-based array index.",
                     "readonly": true,
                     "type": "string"
                 },
                 "MinReadingRange": {
-                    "description": "Minimum value for this Voltage sensor.",
-                    "longDescription": "The value of this property shall indicate the lowest possible value for ReadingVolts. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "Minimum value for this sensor.",
+                    "longDescription": "This property shall indicate the lowest possible value for the ReadingVolts property.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1084,7 +1084,7 @@
                 },
                 "Name": {
                     "description": "Voltage sensor name.",
-                    "longDescription": "The value of this property shall be the name of the Voltage sensor.",
+                    "longDescription": "This property shall contain the name of the Voltage sensor.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1093,18 +1093,18 @@
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
-                    "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PhysicalContext": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext",
-                    "description": "Describes the area or device to which this voltage measurement applies.",
-                    "longDescription": "The value of this property shall be a description of the affected device or region within the chassis to which this voltage measurement applies.",
+                    "description": "The area or device to which this voltage measurement applies.",
+                    "longDescription": "This property shall contain a description of the affected device or region within the chassis to which this voltage measurement applies.",
                     "readonly": true
                 },
                 "ReadingVolts": {
-                    "description": "The present reading of the voltage sensor.",
-                    "longDescription": "The value of this property shall be the present reading of the voltage sensor's reading.",
+                    "description": "The reading of the voltage sensor.",
+                    "longDescription": "This property shall contain the voltage sensor's reading.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1113,20 +1113,20 @@
                     "units": "V"
                 },
                 "RelatedItem": {
-                    "description": "Describes the areas or devices to which this voltage measurement applies.",
+                    "description": "The areas or devices to which this voltage measurement applies.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/idRef"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
-                    "longDescription": "The value of this property shall be an array of IDs containing pointers consistent with JSON pointer syntax to the areas or devices to which this voltage measurement applies.",
+                    "longDescription": "This property shall contain an array of IDs for pointers consistent with JSON Pointer syntax to the areas or devices to which this voltage measurement applies.",
                     "readonly": true,
                     "type": "array"
                 },
                 "RelatedItem@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "SensorNumber": {
                     "description": "A numerical identifier to represent the voltage sensor.",
-                    "longDescription": "The value of this property shall be a numerical identifier for this voltage sensor that is unique within this resource.",
+                    "longDescription": "This property shall contain a numerical identifier for this voltage sensor that is unique within this Resource.",
                     "readonly": true,
                     "type": [
                         "integer",
@@ -1135,12 +1135,12 @@
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "This property describes the status and health of the resource and its children.",
-                    "longDescription": "This property shall contain any status or health properties of the resource."
+                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
+                    "longDescription": "This property shall contain any status or health properties of the Resource."
                 },
                 "UpperThresholdCritical": {
-                    "description": "Above normal range but not yet fatal.",
-                    "longDescription": "The value of this property shall indicate the present reading is above the normal range but is not yet fatal. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is above normal range but not yet fatal.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is above the normal range but is not yet fatal.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1149,8 +1149,8 @@
                     "units": "V"
                 },
                 "UpperThresholdFatal": {
-                    "description": "Above normal range and is fatal.",
-                    "longDescription": "The value of this property shall indicate the present reading is above the normal range and is fatal. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is above normal range and fatal.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is above the normal range and is fatal.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1159,8 +1159,8 @@
                     "units": "V"
                 },
                 "UpperThresholdNonCritical": {
-                    "description": "Above normal range.",
-                    "longDescription": "The value of this property shall indicate the present reading is above the normal range but is not critical. Units shall use the same units as the related ReadingVolts propoerty.",
+                    "description": "The value at which the reading is above normal range.",
+                    "longDescription": "This property shall contain the value at which the ReadingVolts property is above the normal range.  The value of the property shall use the same units as the ReadingVolts property.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1177,10 +1177,10 @@
         },
         "VoltageActions": {
             "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
+            "description": "The available actions for this Resource.",
+            "longDescription": "This type shall contain the available actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -1196,8 +1196,8 @@
             "properties": {
                 "Oem": {
                     "$ref": "#/definitions/VoltageOemActions",
-                    "description": "This property contains the available OEM specific actions for this resource.",
-                    "longDescription": "This property shall contain any additional OEM actions for this resource.",
+                    "description": "The available OEM-specific actions for this Resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this Resource.",
                     "versionAdded": "v1_3_0"
                 }
             },
@@ -1205,10 +1205,10 @@
         },
         "VoltageOemActions": {
             "additionalProperties": true,
-            "description": "The available OEM specific actions for this resource.",
-            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "description": "The available OEM-specific actions for this Resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
                     "type": [
                         "array",
@@ -1227,5 +1227,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2017.3",
-    "title": "#Power.v1_5_2.Power"
+    "title": "#Power.v1_5_4.Power"
 }
\ No newline at end of file