diff --git a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+errored+v1_schema.avsc b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+errored+v1_schema.avsc
index bfbdb12d..367968ef 100644
--- a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+errored+v1_schema.avsc
+++ b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+errored+v1_schema.avsc
@@ -4,14 +4,48 @@
   "doc": "Avro Event Format for CloudEvents created with openedx_events/schema",
   "fields": [
     {
-      "name": "exam_attempt_data",
+      "name": "exam_attempt",
       "type": {
         "name": "ExamAttemptData",
         "type": "record",
         "fields": [
           {
-            "name": "user_id",
-            "type": "long"
+            "name": "student_user",
+            "type": {
+              "name": "UserData",
+              "type": "record",
+              "fields": [
+                {
+                  "name": "id",
+                  "type": "long"
+                },
+                {
+                  "name": "is_active",
+                  "type": "boolean"
+                },
+                {
+                  "name": "pii",
+                  "type": {
+                    "name": "UserPersonalData",
+                    "type": "record",
+                    "fields": [
+                      {
+                        "name": "username",
+                        "type": "string"
+                      },
+                      {
+                        "name": "email",
+                        "type": "string"
+                      },
+                      {
+                        "name": "name",
+                        "type": "string"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
           },
           {
             "name": "course_key",
@@ -25,49 +59,7 @@
             "name": "requesting_user",
             "type": [
               "null",
-              {
-                "name": "UserData",
-                "type": "record",
-                "fields": [
-                  {
-                    "name": "id",
-                    "type": "long"
-                  },
-                  {
-                    "name": "is_active",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "pii",
-                    "type": {
-                      "name": "UserPersonalData",
-                      "type": "record",
-                      "fields": [
-                        {
-                          "name": "username",
-                          "type": "string"
-                        },
-                        {
-                          "name": "email",
-                          "type": "string"
-                        },
-                        {
-                          "name": "name",
-                          "type": "string"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ],
-            "default": null
-          },
-          {
-            "name": "credit_requirement_status",
-            "type": [
-              "null",
-              "string"
+              "UserData"
             ],
             "default": null
           }
diff --git a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+rejected+v1_schema.avsc b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+rejected+v1_schema.avsc
index dee79ecf..4531a8b7 100644
--- a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+rejected+v1_schema.avsc
+++ b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+rejected+v1_schema.avsc
@@ -4,14 +4,48 @@
   "doc": "Avro Event Format for CloudEvents created with openedx_events/schema",
   "fields": [
     {
-      "name": "exam_attempt_data",
+      "name": "exam_attempt",
       "type": {
         "name": "ExamAttemptData",
         "type": "record",
         "fields": [
           {
-            "name": "user_id",
-            "type": "long"
+            "name": "student_user",
+            "type": {
+              "name": "UserData",
+              "type": "record",
+              "fields": [
+                {
+                  "name": "id",
+                  "type": "long"
+                },
+                {
+                  "name": "is_active",
+                  "type": "boolean"
+                },
+                {
+                  "name": "pii",
+                  "type": {
+                    "name": "UserPersonalData",
+                    "type": "record",
+                    "fields": [
+                      {
+                        "name": "username",
+                        "type": "string"
+                      },
+                      {
+                        "name": "email",
+                        "type": "string"
+                      },
+                      {
+                        "name": "name",
+                        "type": "string"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
           },
           {
             "name": "course_key",
@@ -25,49 +59,7 @@
             "name": "requesting_user",
             "type": [
               "null",
-              {
-                "name": "UserData",
-                "type": "record",
-                "fields": [
-                  {
-                    "name": "id",
-                    "type": "long"
-                  },
-                  {
-                    "name": "is_active",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "pii",
-                    "type": {
-                      "name": "UserPersonalData",
-                      "type": "record",
-                      "fields": [
-                        {
-                          "name": "username",
-                          "type": "string"
-                        },
-                        {
-                          "name": "email",
-                          "type": "string"
-                        },
-                        {
-                          "name": "name",
-                          "type": "string"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ],
-            "default": null
-          },
-          {
-            "name": "credit_requirement_status",
-            "type": [
-              "null",
-              "string"
+              "UserData"
             ],
             "default": null
           }
diff --git a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+reset+v1_schema.avsc b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+reset+v1_schema.avsc
index a279d550..ee2e96a9 100644
--- a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+reset+v1_schema.avsc
+++ b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+reset+v1_schema.avsc
@@ -4,14 +4,48 @@
   "doc": "Avro Event Format for CloudEvents created with openedx_events/schema",
   "fields": [
     {
-      "name": "exam_attempt_data",
+      "name": "exam_attempt",
       "type": {
         "name": "ExamAttemptData",
         "type": "record",
         "fields": [
           {
-            "name": "user_id",
-            "type": "long"
+            "name": "student_user",
+            "type": {
+              "name": "UserData",
+              "type": "record",
+              "fields": [
+                {
+                  "name": "id",
+                  "type": "long"
+                },
+                {
+                  "name": "is_active",
+                  "type": "boolean"
+                },
+                {
+                  "name": "pii",
+                  "type": {
+                    "name": "UserPersonalData",
+                    "type": "record",
+                    "fields": [
+                      {
+                        "name": "username",
+                        "type": "string"
+                      },
+                      {
+                        "name": "email",
+                        "type": "string"
+                      },
+                      {
+                        "name": "name",
+                        "type": "string"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
           },
           {
             "name": "course_key",
@@ -25,49 +59,7 @@
             "name": "requesting_user",
             "type": [
               "null",
-              {
-                "name": "UserData",
-                "type": "record",
-                "fields": [
-                  {
-                    "name": "id",
-                    "type": "long"
-                  },
-                  {
-                    "name": "is_active",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "pii",
-                    "type": {
-                      "name": "UserPersonalData",
-                      "type": "record",
-                      "fields": [
-                        {
-                          "name": "username",
-                          "type": "string"
-                        },
-                        {
-                          "name": "email",
-                          "type": "string"
-                        },
-                        {
-                          "name": "name",
-                          "type": "string"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ],
-            "default": null
-          },
-          {
-            "name": "credit_requirement_status",
-            "type": [
-              "null",
-              "string"
+              "UserData"
             ],
             "default": null
           }
diff --git a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+submitted+v1_schema.avsc b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+submitted+v1_schema.avsc
index dee651ad..772461bd 100644
--- a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+submitted+v1_schema.avsc
+++ b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+submitted+v1_schema.avsc
@@ -4,14 +4,48 @@
   "doc": "Avro Event Format for CloudEvents created with openedx_events/schema",
   "fields": [
     {
-      "name": "exam_attempt_data",
+      "name": "exam_attempt",
       "type": {
         "name": "ExamAttemptData",
         "type": "record",
         "fields": [
           {
-            "name": "user_id",
-            "type": "long"
+            "name": "student_user",
+            "type": {
+              "name": "UserData",
+              "type": "record",
+              "fields": [
+                {
+                  "name": "id",
+                  "type": "long"
+                },
+                {
+                  "name": "is_active",
+                  "type": "boolean"
+                },
+                {
+                  "name": "pii",
+                  "type": {
+                    "name": "UserPersonalData",
+                    "type": "record",
+                    "fields": [
+                      {
+                        "name": "username",
+                        "type": "string"
+                      },
+                      {
+                        "name": "email",
+                        "type": "string"
+                      },
+                      {
+                        "name": "name",
+                        "type": "string"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
           },
           {
             "name": "course_key",
@@ -25,49 +59,7 @@
             "name": "requesting_user",
             "type": [
               "null",
-              {
-                "name": "UserData",
-                "type": "record",
-                "fields": [
-                  {
-                    "name": "id",
-                    "type": "long"
-                  },
-                  {
-                    "name": "is_active",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "pii",
-                    "type": {
-                      "name": "UserPersonalData",
-                      "type": "record",
-                      "fields": [
-                        {
-                          "name": "username",
-                          "type": "string"
-                        },
-                        {
-                          "name": "email",
-                          "type": "string"
-                        },
-                        {
-                          "name": "name",
-                          "type": "string"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ],
-            "default": null
-          },
-          {
-            "name": "credit_requirement_status",
-            "type": [
-              "null",
-              "string"
+              "UserData"
             ],
             "default": null
           }
diff --git a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+verified+v1_schema.avsc b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+verified+v1_schema.avsc
index eeec0765..2cd6ef62 100644
--- a/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+verified+v1_schema.avsc
+++ b/openedx_events/event_bus/avro/tests/schemas/org+openedx+learning+exam+attempt+verified+v1_schema.avsc
@@ -4,14 +4,48 @@
   "doc": "Avro Event Format for CloudEvents created with openedx_events/schema",
   "fields": [
     {
-      "name": "exam_attempt_data",
+      "name": "exam_attempt",
       "type": {
         "name": "ExamAttemptData",
         "type": "record",
         "fields": [
           {
-            "name": "user_id",
-            "type": "long"
+            "name": "student_user",
+            "type": {
+              "name": "UserData",
+              "type": "record",
+              "fields": [
+                {
+                  "name": "id",
+                  "type": "long"
+                },
+                {
+                  "name": "is_active",
+                  "type": "boolean"
+                },
+                {
+                  "name": "pii",
+                  "type": {
+                    "name": "UserPersonalData",
+                    "type": "record",
+                    "fields": [
+                      {
+                        "name": "username",
+                        "type": "string"
+                      },
+                      {
+                        "name": "email",
+                        "type": "string"
+                      },
+                      {
+                        "name": "name",
+                        "type": "string"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
           },
           {
             "name": "course_key",
@@ -25,49 +59,7 @@
             "name": "requesting_user",
             "type": [
               "null",
-              {
-                "name": "UserData",
-                "type": "record",
-                "fields": [
-                  {
-                    "name": "id",
-                    "type": "long"
-                  },
-                  {
-                    "name": "is_active",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "pii",
-                    "type": {
-                      "name": "UserPersonalData",
-                      "type": "record",
-                      "fields": [
-                        {
-                          "name": "username",
-                          "type": "string"
-                        },
-                        {
-                          "name": "email",
-                          "type": "string"
-                        },
-                        {
-                          "name": "name",
-                          "type": "string"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ],
-            "default": null
-          },
-          {
-            "name": "credit_requirement_status",
-            "type": [
-              "null",
-              "string"
+              "UserData"
             ],
             "default": null
           }