diff --git a/sections/cper-section-nvidia.c b/sections/cper-section-nvidia.c
index e2f8aef..c5eb493 100644
--- a/sections/cper-section-nvidia.c
+++ b/sections/cper-section-nvidia.c
@@ -4,6 +4,7 @@
  **/
 
 #include <stdio.h>
+#include <stddef.h>
 #include <string.h>
 #include <json.h>
 #include "../edk/Cper.h"
@@ -16,21 +17,25 @@
 	EFI_NVIDIA_ERROR_DATA *nvidia_error = (EFI_NVIDIA_ERROR_DATA *)section;
 	json_object *section_ir = json_object_new_object();
 
-	//Signature.
 	json_object_object_add(section_ir, "signature",
 			       json_object_new_string(nvidia_error->Signature));
 
-	//Fields.
+	json_object *severity = json_object_new_object();
+	json_object_object_add(severity, "code",
+			       json_object_new_uint64(nvidia_error->Severity));
+	json_object_object_add(severity, "name",
+			       json_object_new_string(severity_to_string(
+				       nvidia_error->Severity)));
+	json_object_object_add(section_ir, "severity", severity);
+
 	json_object_object_add(section_ir, "errorType",
 			       json_object_new_int(nvidia_error->ErrorType));
 	json_object_object_add(
 		section_ir, "errorInstance",
 		json_object_new_int(nvidia_error->ErrorInstance));
-	json_object_object_add(section_ir, "severity",
-			       json_object_new_int(nvidia_error->Severity));
 	json_object_object_add(section_ir, "socket",
 			       json_object_new_int(nvidia_error->Socket));
-	json_object_object_add(section_ir, "numberRegs",
+	json_object_object_add(section_ir, "registerCount",
 			       json_object_new_int(nvidia_error->NumberRegs));
 	json_object_object_add(
 		section_ir, "instanceBase",
@@ -38,13 +43,13 @@
 
 	// Registers (Address Value pairs).
 	json_object *regarr = json_object_new_array();
-	UINT64 *regPtr = &nvidia_error->InstanceBase;
-	for (int i = 0; i < nvidia_error->NumberRegs; i++) {
+	EFI_NVIDIA_REGISTER_DATA *regPtr = nvidia_error->Register;
+	for (int i = 0; i < nvidia_error->NumberRegs; i++, regPtr++) {
 		json_object *reg = json_object_new_object();
 		json_object_object_add(reg, "address",
-				       json_object_new_uint64(*++regPtr));
+				       json_object_new_uint64(regPtr->Address));
 		json_object_object_add(reg, "value",
-				       json_object_new_uint64(*++regPtr));
+				       json_object_new_uint64(regPtr->Value));
 		json_object_array_add(regarr, reg);
 	}
 	json_object_object_add(section_ir, "registers", regarr);
@@ -58,8 +63,8 @@
 	json_object *regarr = json_object_object_get(section, "registers");
 	int numRegs = json_object_array_length(regarr);
 
-	size_t section_sz =
-		sizeof(EFI_NVIDIA_ERROR_DATA) + (numRegs * 2 * sizeof(UINT64));
+	size_t section_sz = offsetof(EFI_NVIDIA_ERROR_DATA, Register) +
+			    numRegs * sizeof(EFI_NVIDIA_REGISTER_DATA);
 	EFI_NVIDIA_ERROR_DATA *section_cper =
 		(EFI_NVIDIA_ERROR_DATA *)calloc(1, section_sz);
 
@@ -75,22 +80,23 @@
 		json_object_object_get(section, "errorType"));
 	section_cper->ErrorInstance = json_object_get_int(
 		json_object_object_get(section, "errorInstance"));
-	section_cper->Severity = json_object_get_int(
-		json_object_object_get(section, "severity"));
+	json_object *severity = json_object_object_get(section, "severity");
+	section_cper->Severity = (UINT8)json_object_get_uint64(
+		json_object_object_get(severity, "code"));
 	section_cper->Socket =
 		json_object_get_int(json_object_object_get(section, "socket"));
 	section_cper->NumberRegs = json_object_get_int(
-		json_object_object_get(section, "numberRegs"));
+		json_object_object_get(section, "registerCount"));
 	section_cper->InstanceBase = json_object_get_uint64(
 		json_object_object_get(section, "instanceBase"));
 
 	// Registers (Address Value pairs).
-	UINT64 *regPtr = &section_cper->InstanceBase;
-	for (int i = 0; i < numRegs; i++) {
+	EFI_NVIDIA_REGISTER_DATA *regPtr = section_cper->Register;
+	for (int i = 0; i < numRegs; i++, regPtr++) {
 		json_object *reg = json_object_array_get_idx(regarr, i);
-		*++regPtr = json_object_get_uint64(
+		regPtr->Address = json_object_get_uint64(
 			json_object_object_get(reg, "address"));
-		*++regPtr = json_object_get_uint64(
+		regPtr->Value = json_object_get_uint64(
 			json_object_object_get(reg, "value"));
 	}