diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index bda5296..ac5343e 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -532,23 +532,27 @@ resource "aws_glue_catalog_table" "athena_table_time" {
       type = "string"
     }
     columns {
-      name = "age"
+      name = "eventType"
       type = "string"
     }
     columns {
-      name = "eventType"
+      name = "timestamp"
       type = "string"
     }
     columns {
-      name = "section"
+      name = "sectionID"
       type = "string"
     }
     columns {
-      name = "event"
+      name = "unitID"
       type = "string"
     }
     columns {
-      name = "timestamp"
+      name = "lessonID"
+      type = "string"
+    }
+    columns {
+      name = "event"
       type = "string"
     }
     columns {
@@ -592,24 +596,24 @@ resource "aws_glue_catalog_table" "athena_table_attempts" {
       type = "string"
     }
     columns {
-      name = "age"
+      name = "eventType"
       type = "string"
     }
     columns {
-      name = "eventType"
+      name = "timestamp"
       type = "string"
     }
     columns {
-      name = "section"
+      name = "sectionID"
       type = "string"
     }
     columns {
-      name = "event"
+      name = "quizID"
       type = "string"
     }
     columns {
-      name = "timestamp"
-      type = "string"
+      name = "questionNo"
+      type = "int"
     }
     columns {
       name = "attempts"