diff --git a/Tests/UniversityExample/create_tables.sql b/Tests/UniversityExample/create_tables.sql
index 73eb619e6e..99872488c8 100644
--- a/Tests/UniversityExample/create_tables.sql
+++ b/Tests/UniversityExample/create_tables.sql
@@ -2,13 +2,13 @@ CREATE TABLE classroom(building text encoding dict, room_number text encoding di
 CREATE TABLE department(dept_name text encoding dict, building text encoding dict, budget text encoding dict) WITH (fragment_size=2);
 CREATE TABLE course(course_id text encoding dict, title text encoding dict, dept_name text encoding dict, credits smallint) WITH (fragment_size=2);
 CREATE TABLE instructor(ID text encoding dict, name text NOT NULL encoding dict, dept_name text encoding dict, salary integer) WITH (fragment_size=2);
-CREATE TABLE section(course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year smallint, building text encoding dict, room_number text encoding dict, time_slot_id text encoding dict) WITH (fragment_size=2);
-CREATE TABLE teaches(ID text encoding dict, course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year smallint) WITH (fragment_size=2);
+CREATE TABLE section(course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year_ smallint, building text encoding dict, room_number text encoding dict, time_slot_id text encoding dict) WITH (fragment_size=2);
+CREATE TABLE teaches(ID text encoding dict, course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year_ smallint) WITH (fragment_size=2);
 CREATE TABLE student(ID text encoding dict, name text NOT NULL encoding dict, dept_name text encoding dict, tot_cred smallint) WITH (fragment_size=2);
-CREATE TABLE takes(ID text encoding dict, course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year smallint, grade text encoding dict) WITH (fragment_size=2);
+CREATE TABLE takes(ID text encoding dict, course_id text encoding dict, sec_id text encoding dict, semester text encoding dict, year_ smallint, grade text encoding dict) WITH (fragment_size=2);
 CREATE TABLE advisor(s_ID text encoding dict, i_ID text encoding dict) WITH (fragment_size=2);
 CREATE TABLE prereq(course_id text encoding dict, prereq_id text encoding dict) WITH (fragment_size=2);
-CREATE TABLE timeslot(time_slot_id text encoding dict, day text encoding dict, start_time time, end_time time) WITH (fragment_size=2);
+CREATE TABLE timeslot(time_slot_id text encoding dict, day_ text encoding dict, start_time time, end_time time) WITH (fragment_size=2);
 COPY classroom FROM './classroom.csv';
 COPY department FROM './department.csv';
 COPY course FROM './course.csv';
diff --git a/Tests/UniversityExample/section.csv b/Tests/UniversityExample/section.csv
index 8b34d29f4b..5d36a6d8fc 100644
--- a/Tests/UniversityExample/section.csv
+++ b/Tests/UniversityExample/section.csv
@@ -1,4 +1,4 @@
-course_id,sec_id,semester,year,building,room_number,time_slot_id
+course_id,sec_id,semester,year_,building,room_number,time_slot_id
 BIO-101,1,Summer,2009,Painter,514,B
 BIO-301,1,Summer,2010,Painter,514,A
 CS-101,1,Fall,2009,Packard,101,H
diff --git a/Tests/UniversityExample/takes.csv b/Tests/UniversityExample/takes.csv
index aeca6f03b0..79441174c1 100644
--- a/Tests/UniversityExample/takes.csv
+++ b/Tests/UniversityExample/takes.csv
@@ -1,4 +1,4 @@
-ID,course_id,sec_id,semester,year,grade
+ID,course_id,sec_id,semester,year_,grade
 00128,CS-101,1,Fall,2009,A
 00128,CS-347,1,Fall,2009,A-
 12345,CS-101,1,Fall,2009,C
diff --git a/Tests/UniversityExample/teaches.csv b/Tests/UniversityExample/teaches.csv
index 475fd94868..9be17c3175 100644
--- a/Tests/UniversityExample/teaches.csv
+++ b/Tests/UniversityExample/teaches.csv
@@ -1,4 +1,4 @@
-ID,course_id,sec_id,semester,year
+ID,course_id,sec_id,semester,year_
 10101,CS-101,1,Fall,2009
 10101,CS-315,1,Spring,2010
 10101,CS-347,1,Fall,2009
diff --git a/Tests/UniversityExample/timeslot.csv b/Tests/UniversityExample/timeslot.csv
index 0950b3f088..0e271a5d82 100644
--- a/Tests/UniversityExample/timeslot.csv
+++ b/Tests/UniversityExample/timeslot.csv
@@ -1,4 +1,4 @@
-time_slot_id,day,start_time,end_time
+time_slot_id,day_,start_time,end_time
 A,M,8:00:00,8:50:00
 A,W,8:00:00,8:50:00
 A,F,8:00:00,8:50:00