Commits

Clark C. Evans  committed 2f3e690

Updated regression schema to remove dashes since they
cause locale sorting issues across platforms. Added
ENUM data types for some columns.

  • Participants
  • Parent commits 9f90569

Comments (0)

Files changed (1)

File test/sql/regress-pgsql.sql

     CONSTRAINT name_uk
       UNIQUE (name)
 );
-COMMENT ON TABLE ad.school IS $_$
-Academic School
-~~~~~~~~~~~~~~~
-
-This table lists all the organizational units with educational
-responsibilities in a university.  Schools offer degree programs and
-have a number of more granular departments which have courses.
-$_$;
 
 CREATE TABLE ad.department (
     code        VARCHAR(16) NOT NULL,
       FOREIGN KEY (school)
       REFERENCES ad.school(code)
 );
-COMMENT ON TABLE ad.department IS $_$
-Academic Department
-~~~~~~~~~~~~~~~~~~~
-
-This table lists all the departments (partitioned by school) in a given
-university.  Departments are the primary organization of subject
-specific courses and teaching staff.
-$_$;
 
 CREATE TABLE ad.program (
     school      VARCHAR(16) NOT NULL,
       FOREIGN KEY (school)
       REFERENCES ad.school(code)
 );
-COMMENT ON TABLE ad.program IS $_$
-Degree Program
-~~~~~~~~~~~~~~
-
-A listing of degree programs offered by a school.
-$_$;
 
 CREATE TABLE ad.course (
     department  VARCHAR(16) NOT NULL,
       FOREIGN KEY (department)
       REFERENCES ad.department(code)
 );
-COMMENT ON TABLE ad.course IS $_$
-Course Offering
-~~~~~~~~~~~~~~~
-
-A listing of course offerings, by department.
-$_$;
 
 INSERT INTO ad.school (code, name) VALUES 
 ('ns', 'School of Natural Sciences'),
     CONSTRAINT instructor_title_ck
       CHECK (title IN ('mr','dr','prof','ms'))
 );
-COMMENT ON TABLE id.instructor IS $_$
-Class Instructor
-~~~~~~~~~~~~~~~~
-
-This table lists individuals assigned to teach, be it tenure track
-faculty, a visiting or adjunct professor, or a graduate student.
-$_$;
 
 CREATE TABLE id.confidential (
     instructor  VARCHAR(16) NOT NULL,
       FOREIGN KEY (instructor)
       REFERENCES id.instructor(code) 
 );
-COMMENT ON TABLE id.confidential IS $_$
-Confidential Instructor Detail
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An entry in this table is optional for each instructor, however, if it
-is provided, than both ``SSN`` and ``pay_grade`` are required columns
-(``home_phone`` is optional).
-$_$;
 
 CREATE TABLE id.appointment (
     department  VARCHAR(16) NOT NULL,
       FOREIGN KEY (instructor)
       REFERENCES id.instructor(code)
 );
-COMMENT ON TABLE id.appointment IS $_$
-Instructor/Department Appointment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Rows in this table represent an appointment of an instructor to a given
-department.  The ``percent`` column holds the percent appointment from a
-budgetary perspective, honorary appointments can also be registered
-using ``NULL`` for this column.
-$_$;
 
 INSERT INTO id.instructor (code, title, full_name, phone, email) VALUES
 ('cfergus12', 'prof', 'Adam Ferguson', NULL, 'cfergus12@example.com'),
   NN - Not Null      CK - Check Constraint   
 $_$;
 
+CREATE TYPE ed.enrollment_status_t AS ENUM ('enr','inc','ngr');
+CREATE TYPE ed.student_gender_t AS ENUM ('f','i','m');
+
 CREATE TABLE ed.student (
     number      INTEGER NOT NULL,
     name        VARCHAR(64) NOT NULL, 
-    gender      CHAR(1) NOT NULL,
+    gender      ed.student_gender_t NOT NULL,
     dob         DATE NOT NULL,
     school      VARCHAR(16),
     program     VARCHAR(16),
     start_date  DATE NOT NULL,
-    is_active   BOOLEAN NOT NULL,
+    is_active   BOOLEAN NOT NUll,
     CONSTRAINT student_pk 
       PRIMARY KEY (number),
     CONSTRAINT student_school_fk
       FOREIGN KEY (school)
-      REFERENCES ad.school(code),
+      REFERENCES ad.school (code),
     CONSTRAINT student_program_fk
       FOREIGN KEY (school, program)
-      REFERENCES ad.program(school, code)    
+      REFERENCES ad.program (school, code)    
 );
 
 CREATE TABLE ed.enrollment (
     student     INTEGER NOT NULL,
     class       INTEGER NOT NULL,
-    status      VARCHAR(16) NOT NULL,
+    status      ed.enrollment_status_t NOT NULL,
     grade       DECIMAL(3,2),
     CONSTRAINT enrollment_pk
       PRIMARY KEY (student, class),
 );
 
 INSERT INTO ed.student (number, name, gender, dob, school, program, start_date, is_active) VALUES
-('0025371', 'John L. Hanley', 'm', '1990-04-28', 'egn', 'gbuseng', '2009-07-15', TRUE),
-('0029878', 'Ellen Lansburgh', 'f', '1992-02-01', 'bus', 'uacct', '2008-01-05', TRUE),
-('0037278', 'Ming Wang', 'm', '1988-03-15', 'la', 'gengl', '2002-11-27', FALSE),
-('0092039', 'Syed Ishaq', 'm', '1992-10-23', 'art', 'gart', '2010-09-02', TRUE),
-('0037283', 'Janine Sylvia', 'f', '1993-12-02', 'ns', 'uastro', '2009-08-14', TRUE),
-('0017385', 'Valeria Rinaldi', 'f', '1985-09-02', 'bus', 'pcap', '2004-09-01', FALSE),
-('0028371', 'Ken Tanaka', 'm', '1992-11-03', 'art', 'gart', '2010-09-08', TRUE),
-('0021837', 'Jalene Flambeau', 'f', '1989-03-23', 'art', 'gart', '2010-06-11', TRUE),
-('0038187', 'Mary Ann Flenderson', 'f', '1993-05-16', 'ns', 'uphys', '2010-08-26', TRUE),
-('0043278', 'Trina Wood Campbell', 'f', '1990-02-12', 'egn', 'gme', '2007-09-01', TRUE),
-('0027138', 'Artem Karpov', 'm', '1991-10-16', 'egn', 'gbe', '2009-08-22', TRUE),
-('0012837', 'Christine Leung', 'f', '1991-06-06', 'egn', 'gme', '2009-08-17', TRUE),
-('0038721', 'Alicia Montez-Galliano', 'f', '1994-07-11', 'ns', 'uchem', '2010-09-10', TRUE),
-('0037182', 'Amy Yang', 'f', '1992-12-17', 'ns', 'uphys', '2002-08-10', FALSE),
-('0032718', 'Raisa Antonov', 'f', '1992-12-09', 'egn', 'gbe', '2008-09-15', FALSE),
-('0032711', 'Peter Zajac Jr.', 'm', '1994-01-23', 'bus', 'ucorpfi', '2009-09-10', TRUE),
-('0033278', 'Andrea Kaminski', 'f', '1981-04-20', 'bus', 'pcap', '2009-01-15', TRUE),
-('0017283', 'Lucy Ryong', 'f', '1988-01-25', 'edu', 'gedu', '2009-01-27', TRUE),
-('0012738', 'Helmut Dietmark', 'm', '1989-11-27', 'edu', 'psci', '2008-03-17', TRUE),
-('0023817', 'Benjamin Wen', 'm', '1993-12-16', 'la', 'uhist', '2009-01-12', TRUE),
-('0057382', 'Paul Duncan Ulam', 'm', '2001-05-05', 'la', 'uspan', '2009-05-21', TRUE),
-('0013723', 'Narissa Maya', 'f', '1992-04-30', 'la', 'upsych', '2007-11-21', FALSE),
-('0031332', 'Dara Subramanya', 'f', '1994-11-16', 'la', 'upsych', '2008-09-10', TRUE),
-('0035572', 'Corinna Ellis', 'f', '1995-07-22', 'edu', 'glited', '2007-05-14', TRUE),
-('0012328', 'Karen Yuen', 'f', '1991-09-10', 'ns', 'uphys', '2007-05-16', TRUE),
-('0032214', 'Joseph Tan', 'm', '1992-08-01', 'egn', 'gbuseng', '2008-01-06', TRUE),
-('0022313', 'James Earl Sims III', 'm', '2002-07-06', 'egn', 'umech', '2004-08-16', TRUE),
-('0024431', 'Annette Dupree', 'f', '1987-01-28', 'egn', 'umech', '2006-01-16', TRUE),
-('0038794', 'Bailey Melvin', 'm', '1988-03-13', 'la', 'psciwri', '2005-04-20', TRUE),
-('0037855', 'Amina N. Elsaeed', 'f', '1987-10-29', 'la', 'uhist', '2005-09-02', TRUE),
-('0035523', 'Nikki Agbo', 'm', '1985-05-05', 'la', 'gengl', '2006-02-25', TRUE),
-('0020927', 'Glenn L. McNair', 'm', '1987-12-13', 'egn', 'gee', '2009-08-23', TRUE),
-('0035183', 'Teisha Worth Day', 'f', '1983-12-31', 'edu', 'gedlead', '2009-08-21', TRUE),
-('0025723', 'Kumar Suresh', 'm', '1994-09-11', 'egn', 'ucompsci', '2009-08-23', TRUE),
-('0024672', 'Mahesh Basa', 'm', '1995-08-21', 'egn', 'ucompsci', '2008-04-15', FALSE),
-('0023137', 'Rachel Feld', 'f', '1992-09-27', 'ns', 'uchem', '2008-12-23', TRUE),
-('0035163', 'Nicola Ralls Jr.', 'f', '1993-06-02', 'bus', 'uacct', '2010-01-12', TRUE),
-('0021135', 'Luis Riviera Espinoza', 'm', '1993-05-21', 'egn', 'gbe', '2010-02-19', TRUE),
-('0031735', 'Demetrios Kanakis', 'm', '1995-04-17', 'egn', 'ucompsci', '2009-05-21', TRUE),
-('0021166', 'Laura Elmer Long', 'f', '1991-02-14', 'ns', 'uastro', '2009-01-31', TRUE),
-('0031331', 'Khadija Hamad Azzan', 'f', '1992-11-26', 'ns', 'uastro', '2008-09-21', FALSE),
-('0036446', 'Milton Mahanga', 'm', '1991-11-06', 'art', 'gart', '2009-05-05', TRUE),
-('0026764', 'Bernard Careval', 'm', '1992-08-23', 'art', 'gart', '2008-07-30', TRUE),
-('0026743', 'Ulf Knudsen', 'm', '1990-11-14', 'ns', 'uphys', '2008-04-27', TRUE),
-('0031835', 'Paavo Kekkonen', 'm', '2000-09-08', 'ns', 'uphys', '2008-06-11', TRUE),
-('0029301', 'Eduardo Serrano', 'm', '1991-09-09', 'art', 'uhist', '2006-01-14', TRUE),
-('0021263', 'Ari Ben David', 'm', '1989-03-15', 'la', 'gengl', '2006-12-15', TRUE),
-('0037744', 'Scott Blank', 'm', '1988-06-12', 'bus', 'ucorpfi', '2007-12-15', TRUE),
-('0028382', 'Martha O''Mally', 'f', '1995-05-14', 'bus', 'pacc', '2005-01-01', TRUE),
-('0027281', 'José N. Marteñes', 'm', '1993-11-19', 'egn', 'ucompsci', '2007-06-15', TRUE),
-('0027817', 'Niall Crawford', 'm', '1998-12-14', 'bus', 'pacc', '2010-01-02', TRUE)
+('25371', 'John L. Hanley', 'm', '1990-04-28', 'egn', 'gbuseng', '2009-07-15', TRUE),
+('29878', 'Ellen Lansburgh', 'f', '1992-02-01', 'bus', 'uacct', '2008-01-05', TRUE),
+('37278', 'Ming Wang', 'm', '1988-03-15', 'la', 'gengl', '2002-11-27', FALSE),
+('92039', 'Syed Ishaq', 'm', '1992-10-23', 'art', 'gart', '2010-09-02', TRUE),
+('37283', 'Janine Sylvia', 'f', '1993-12-02', 'ns', 'uastro', '2009-08-14', TRUE),
+('17385', 'Valeria Rinaldi', 'f', '1985-09-02', 'bus', 'pcap', '2004-09-01', FALSE),
+('28371', 'Ken Tanaka', 'm', '1992-11-03', 'art', 'gart', '2010-09-08', TRUE),
+('21837', 'Jalene Flambeau', 'f', '1989-03-23', 'art', 'gart', '2010-06-11', TRUE),
+('38187', 'Mary Ann Flenderson', 'f', '1993-05-16', 'ns', 'uphys', '2010-08-26', TRUE),
+('43278', 'Trina Wood Campbell', 'f', '1990-02-12', 'egn', 'gme', '2007-09-01', TRUE),
+('27138', 'Artem Karpov', 'm', '1991-10-16', 'egn', 'gbe', '2009-08-22', TRUE),
+('12837', 'Christine Leung', 'f', '1991-06-06', 'egn', 'gme', '2009-08-17', TRUE),
+('38721', 'Alicia Montez-Galliano', 'f', '1994-07-11', 'ns', 'uchem', '2010-09-10', TRUE),
+('37182', 'Amy Yang', 'f', '1992-12-17', 'ns', 'uphys', '2002-08-10', FALSE),
+('32718', 'Raisa Antonov', 'f', '1992-12-09', 'egn', 'gbe', '2008-09-15', FALSE),
+('32711', 'Peter Zajac Jr.', 'm', '1994-01-23', 'bus', 'ucorpfi', '2009-09-10', TRUE),
+('33278', 'Andrea Kaminski', 'f', '1981-04-20', 'bus', 'pcap', '2009-01-15', TRUE),
+('17283', 'Lucy Ryong', 'f', '1988-01-25', 'edu', 'gedu', '2009-01-27', TRUE),
+('12738', 'Helmut Dietmark', 'm', '1989-11-27', 'edu', 'psci', '2008-03-17', TRUE),
+('23817', 'Benjamin Wen', 'm', '1993-12-16', 'la', 'uhist', '2009-01-12', TRUE),
+('57382', 'Paul Duncan Ulam', 'm', '2001-05-05', 'la', 'uspan', '2009-05-21', TRUE),
+('13723', 'Narissa Maya', 'f', '1992-04-30', 'la', 'upsych', '2007-11-21', FALSE),
+('31332', 'Dara Subramanya', 'f', '1994-11-16', 'la', 'upsych', '2008-09-10', TRUE),
+('35572', 'Corinna Ellis', 'f', '1995-07-22', 'edu', 'glited', '2007-05-14', TRUE),
+('12328', 'Karen Yuen', 'f', '1991-09-10', 'ns', 'uphys', '2007-05-16', TRUE),
+('32214', 'Joseph Tan', 'm', '1992-08-01', 'egn', 'gbuseng', '2008-01-06', TRUE),
+('22313', 'James Earl Sims III', 'm', '2002-07-06', 'egn', 'umech', '2004-08-16', TRUE),
+('24431', 'Annette Dupree', 'f', '1987-01-28', 'egn', 'umech', '2006-01-16', TRUE),
+('38794', 'Bailey Melvin', 'm', '1988-03-13', 'la', 'psciwri', '2005-04-20', TRUE),
+('37855', 'Amina N. Elsaeed', 'f', '1987-10-29', 'la', 'uhist', '2005-09-02', TRUE),
+('35523', 'Nikki Agbo', 'm', '1985-05-05', 'la', 'gengl', '2006-02-25', TRUE),
+('20927', 'Glenn L. McNair', 'm', '1987-12-13', 'egn', 'gee', '2009-08-23', TRUE),
+('35183', 'Teisha Worth Day', 'f', '1983-12-31', 'edu', 'gedlead', '2009-08-21', TRUE),
+('25723', 'Kumar Suresh', 'm', '1994-09-11', 'egn', 'ucompsci', '2009-08-23', TRUE),
+('24672', 'Mahesh Basa', 'm', '1995-08-21', 'egn', 'ucompsci', '2008-04-15', FALSE),
+('23137', 'Rachel Feld', 'f', '1992-09-27', 'ns', 'uchem', '2008-12-23', TRUE),
+('35163', 'Nicola Ralls Jr.', 'f', '1993-06-02', 'bus', 'uacct', '2010-01-12', TRUE),
+('21135', 'Luis Riviera Espinoza', 'm', '1993-05-21', 'egn', 'gbe', '2010-02-19', TRUE),
+('31735', 'Demetrios Kanakis', 'm', '1995-04-17', 'egn', 'ucompsci', '2009-05-21', TRUE),
+('21166', 'Laura Elmer Long', 'f', '1991-02-14', 'ns', 'uastro', '2009-01-31', TRUE),
+('31331', 'Khadija Hamad Azzan', 'f', '1992-11-26', 'ns', 'uastro', '2008-09-21', FALSE),
+('36446', 'Milton Mahanga', 'm', '1991-11-06', 'art', 'gart', '2009-05-05', TRUE),
+('26764', 'Bernard Careval', 'm', '1992-08-23', 'art', 'gart', '2008-07-30', TRUE),
+('26743', 'Ulf Knudsen', 'm', '1990-11-14', 'ns', 'uphys', '2008-04-27', TRUE),
+('31835', 'Paavo Kekkonen', 'm', '2000-09-08', 'ns', 'uphys', '2008-06-11', TRUE),
+('29301', 'Eduardo Serrano', 'm', '1991-09-09', 'art', 'uhist', '2006-01-14', TRUE),
+('21263', 'Ari Ben David', 'm', '1989-03-15', 'la', 'gengl', '2006-12-15', TRUE),
+('37744', 'Scott Blank', 'm', '1988-06-12', 'bus', 'ucorpfi', '2007-12-15', TRUE),
+('28382', 'Martha O''Mally', 'f', '1995-05-14', 'bus', 'pacc', '2005-01-01', TRUE),
+('27281', 'José N. Marteñes', 'm', '1993-11-19', 'egn', 'ucompsci', '2007-06-15', TRUE),
+('27817', 'Niall Crawford', 'm', '1998-12-14', 'bus', 'pacc', '2010-01-02', TRUE)
 ;
 
 INSERT INTO ed.enrollment (student, class, status, grade) VALUES
-('0025371', 10086, 'ngr', NULL),
-('0025371', 10051, 'enr', 3.7),
-('0029878', 10086, 'inc', NULL),
-('0037278', 10018, 'enr', 2.6),
-('0092039', 10071, 'enr', 3.1) 
+('25371', 10086, 'ngr', NULL),
+('25371', 10051, 'enr', 3.7),
+('29878', 10086, 'inc', NULL),
+('37278', 10018, 'enr', 2.6),
+('92039', 10071, 'enr', 3.1) 
 ;
 
 
   ('diversity', 'university', 'Region and Ethnic Diversity', 'Courses which provide a rich exposure to foreign cultures and regions qualify for this classification.', 'cross'),
   ('research', 'university', 'Research Experience', 'Research courses focus on the scientific method to create hypothesis and test them in a structured laboratory environment.', 'cross'),
 ('humanities', 'university', 'Arts, Letters, and the Humanities', NULL, NULL),
-  ('art-history', 'school', 'Art', NULL, 'humanities'),
-    ('ancient', 'department', 'Ancient Art', NULL, 'art-history'),
+  ('arthistory', 'school', 'Art', NULL, 'humanities'),
+    ('ancient', 'department', 'Ancient Art', NULL, 'arthistory'),
       ('classical', 'department', 'Classical Art', NULL, 'ancient'),
       ('eastern', 'department', 'Near Eastern Art', NULL, 'ancient'),
-    ('modern', 'department', 'Modern Art', NULL, 'art-history'),
-    ('art-bus', 'department', 'Business of Art', NULL, 'art-history'),
+    ('modern', 'department', 'Modern Art', NULL, 'arthistory'),
+    ('artbus', 'department', 'Business of Art', NULL, 'arthistory'),
   ('literature', 'school', 'English and World Literature', NULL, 'humanities'),
-    ('eng-lit', 'department', 'English-Language Literature', NULL, 'humanities'),
-    ('euro-lit', 'department', 'European Literature in Translation', NULL, 'humanities'),
-    ('non-fiction', 'department', 'Non-Fiction Writing', NULL, 'literature'),
+    ('englit', 'department', 'EnglishLanguage Literature', NULL, 'humanities'),
+    ('eurolit', 'department', 'European Literature in Translation', NULL, 'humanities'),
+    ('nonfiction', 'department', 'NonFiction Writing', NULL, 'literature'),
     ('journalism', 'department', 'Journalistic Writing', NULL, 'literature'),
     ('fiction', 'department', 'Fiction Writing', NULL, 'literature'),
     ('poetry', 'department', 'Poetry Writing', NULL, 'literature'),
   ('history', 'school', 'American and World History', NULL, 'humanities'),
-    ('am-history', 'department', 'American History', NULL, 'humanities'),
-    ('euro-history', 'department', 'European History', NULL, 'humanities'),
-    ('non-western-hist', 'department', 'Non-Western History', NULL, 'humanities'),
-    ('disc-history', 'department', 'Interdisciplinary History', NULL, 'humanities'),
+    ('amhistory', 'department', 'American History', NULL, 'humanities'),
+    ('eurohistory', 'department', 'European History', NULL, 'humanities'),
+    ('nonwesternhist', 'department', 'NonWestern History', NULL, 'humanities'),
+    ('dischistory', 'department', 'Interdisciplinary History', NULL, 'humanities'),
   ('language', 'school', 'World Languages', NULL, 'humanities'),
-    ('mod-language', 'department', 'Modern Languages', NULL, 'language'),
-      ('french', 'department', 'French', NULL, 'mod-language'),
-      ('german', 'department', 'German', NULL, 'mod-language'),
-      ('spanish', 'department', 'Spanish', NULL, 'mod-language'),
-    ('anc-language', 'department', 'Ancient Languages', NULL, 'language'),
+    ('modlanguage', 'department', 'Modern Languages', NULL, 'language'),
+      ('french', 'department', 'French', NULL, 'modlanguage'),
+      ('german', 'department', 'German', NULL, 'modlanguage'),
+      ('spanish', 'department', 'Spanish', NULL, 'modlanguage'),
+    ('anclanguage', 'department', 'Ancient Languages', NULL, 'language'),
     ('linguistics', 'department', 'Linguistics', NULL, 'language'),
-  ('poli-sci', 'school', 'Political Science', NULL, 'humanities'),
-    ('government', 'department', 'Government', NULL, 'poli-sci'),
-    ('int-relations', 'department', 'International Relations', NULL, 'poli-sci'),
-    ('poli-econ', 'department', 'Political Economy', NULL, 'poli-sci'),
+  ('polisci', 'school', 'Political Science', NULL, 'humanities'),
+    ('government', 'department', 'Government', NULL, 'polisci'),
+    ('intrelations', 'department', 'International Relations', NULL, 'polisci'),
+    ('poliecon', 'department', 'Political Economy', NULL, 'polisci'),
   ('psychology', 'school', 'Psychology', NULL, 'humanities'),
-    ('cog-psych', 'department', 'Cognitive Science', NULL, 'psychology'),
-    ('beh-psych', 'department', 'Behavioral Science', NULL, 'psychology'),
-    ('chi-psych', 'department', 'Child Psychology and Development', NULL, 'psychology'),
+    ('cogpsych', 'department', 'Cognitive Science', NULL, 'psychology'),
+    ('behpsych', 'department', 'Behavioral Science', NULL, 'psychology'),
+    ('chipsych', 'department', 'Child Psychology and Development', NULL, 'psychology'),
 ('science', 'university', 'Natural Sciences', NULL, NULL),
   ('astronomy', 'school', 'Astronomy', NULL, 'science'),
-    ('astro-theory', 'department', 'Astrophysics Theory', NULL, 'astronomy'),
-    ('astro-lab', 'department', 'Astronomy Laboratory', NULL, 'astronomy'),
+    ('astrotheory', 'department', 'Astrophysics Theory', NULL, 'astronomy'),
+    ('astrolab', 'department', 'Astronomy Laboratory', NULL, 'astronomy'),
     ('observation', 'department', 'Observing Skills', NULL, 'astronomy'),
   ('chemistry', 'school', 'Chemistry', NULL, 'science'),
-    ('chem-theory', 'department', 'Theoretical Chemistry', NULL, 'chemistry'),
-    ('chem-lab', 'department', 'Chemistry Laboratory', NULL, 'chemistry'),
-    ('chem-computation', 'department', 'Algorithms and Data Visualization for Chemists', NULL, 'chemistry'),
+    ('chemtheory', 'department', 'Theoretical Chemistry', NULL, 'chemistry'),
+    ('chemlab', 'department', 'Chemistry Laboratory', NULL, 'chemistry'),
+    ('chemcomputation', 'department', 'Algorithms and Data Visualization for Chemists', NULL, 'chemistry'),
   ('physics', 'school', 'Physics', NULL, 'science'),
-    ('phys-theory', 'department', 'Theoretical Physics', NULL, 'physics'),
-    ('phys-lab', 'department', 'Practical Physics', NULL, 'physics'),
-    ('phys-computer', 'department',
+    ('phystheory', 'department', 'Theoretical Physics', NULL, 'physics'),
+    ('physlab', 'department', 'Practical Physics', NULL, 'physics'),
+    ('physcomputer', 'department',
         'Computer Languages for Physics', NULL, 'physics'),
   ('math', 'school', 'Mathematics', NULL, 'science'),
     ('analysis', 'department', 'Real and Complex Analysis', NULL, 'math'),
     ('algebra', 'department', 'Abstract Algebra', NULL, 'math'),
     ('statistics', 'department', 'Probability and Statistics', NULL, 'math'),
-('art-design', 'university', 'Art and Design', NULL, NULL),
-  ('studio', 'school', 'Studio Arts', NULL, 'art-design'),
-  ('art-studio', 'school', 'Studio Art', NULL, 'art-design'),
-    ('drawing', 'department', 'Drawing', NULL, 'art-studio'),
-    ('sculpture', 'department', 'Sculpture', NULL, 'art-studio'),
-    ('printmaking', 'department', 'Printmaking', NULL, 'art-studio'),
-  ('industrial', 'school', 'Industrial Design', NULL, 'art-design'),
-  ('digital', 'school', 'Digital Media', NULL, 'art-design'),
-  ('society', 'school', 'Art and Society', NULL, 'art-design'),
+('artdesign', 'university', 'Art and Design', NULL, NULL),
+  ('studio', 'school', 'Studio Arts', NULL, 'artdesign'),
+  ('artstudio', 'school', 'Studio Art', NULL, 'artdesign'),
+    ('drawing', 'department', 'Drawing', NULL, 'artstudio'),
+    ('sculpture', 'department', 'Sculpture', NULL, 'artstudio'),
+    ('printmaking', 'department', 'Printmaking', NULL, 'artstudio'),
+  ('industrial', 'school', 'Industrial Design', NULL, 'artdesign'),
+  ('digital', 'school', 'Digital Media', NULL, 'artdesign'),
+  ('society', 'school', 'Art and Society', NULL, 'artdesign'),
 ('engineering', 'university', 'Engineering', NULL, NULL),
-  ('comp-sci', 'school', 'Computer Science', NULL, 'engineering'),
-    ('comp-theory', 'department', 'Computationial Science', NULL, 'comp-sci'),
-    ('soft-eng', 'department', 'Software Engineering', NULL, 'comp-sci'),
-    ('comp-ai', 'department', 'Artificial Intelligence', NULL, 'comp-sci'),
+  ('compsci', 'school', 'Computer Science', NULL, 'engineering'),
+    ('comptheory', 'department', 'Computationial Science', NULL, 'compsci'),
+    ('softeng', 'department', 'Software Engineering', NULL, 'compsci'),
+    ('compai', 'department', 'Artificial Intelligence', NULL, 'compsci'),
   ('ee', 'school', 'Electrical Engineering', NULL, 'engineering'),
-    ('ee-theory', 'department', 'Electrical Engineering Theory', NULL, 'ee'),
-    ('ee-concentration', 'department', 'EE Concentrations', NULL, 'ee'),
-      ('signal', 'department', 'Signal Processing', NULL, 'ee-concentration'),
-      ('power', 'department', 'Power Electronics', NULL, 'ee-concentration'),
-      ('ee-com', 'department', 'Communications', NULL, 'ee-concentration'),
-      ('ee-networking', 'department', 'Electrical Networking', NULL, 'ee-concentration'),
+    ('eetheory', 'department', 'Electrical Engineering Theory', NULL, 'ee'),
+    ('eeconcentration', 'department', 'EE Concentrations', NULL, 'ee'),
+      ('signal', 'department', 'Signal Processing', NULL, 'eeconcentration'),
+      ('power', 'department', 'Power Electronics', NULL, 'eeconcentration'),
+      ('eecom', 'department', 'Communications', NULL, 'eeconcentration'),
+      ('eenetworking', 'department', 'Electrical Networking', NULL, 'eeconcentration'),
   ('me', 'school', 'Mechanical Engineering', NULL, 'engineering'),
-    ('me-mechanics', 'department', 'Mechanics', NULL, 'me'),
-    ('me-design', 'department', 'Design and Manufacturing', NULL, 'me'),
-    ('me-systems', 'department', 'Systems and Controls', NULL, 'me'),
+    ('memechanics', 'department', 'Mechanics', NULL, 'me'),
+    ('medesign', 'department', 'Design and Manufacturing', NULL, 'me'),
+    ('mesystems', 'department', 'Systems and Controls', NULL, 'me'),
   ('be', 'school', 'Biomedical Engineering', NULL, 'engineering'),
-    ('be-general', 'department', 'General Biomedical Engineering', NULL, 'be'),   
-    ('be-clinical', 'department', 'Clinical Engineering', NULL, 'be'),
+    ('begeneral', 'department', 'General Biomedical Engineering', NULL, 'be'),   
+    ('beclinical', 'department', 'Clinical Engineering', NULL, 'be'),
     ('nanotech', 'department', 'Nanotechnology', NULL, 'be'),
     ('biomaterials', 'department', 'Biomaterials', NULL, 'be'),
 ('education', 'university', 'Education', NULL, NULL),
-  ('teach-ed', 'school', 'Teacher Education', NULL, 'education'),
-    ('methods', 'department', 'Teaching Methods', NULL, 'teach-ed'),
-    ('ed-management', 'department', 'Education Management', NULL, 'teach-ed'),
-    ('early-ed', 'department', 'Early Education', NULL, 'teach-ed'),
-  ('ed-pol', 'school', 'Educational Policy', NULL, 'education'),
-    ('ed-studies', 'department', 'Policy Studies', NULL, 'ed-pol'),
-    ('ed-research', 'department', 'Educational Research', NULL, 'ed-pol'),
+  ('teached', 'school', 'Teacher Education', NULL, 'education'),
+    ('methods', 'department', 'Teaching Methods', NULL, 'teached'),
+    ('edmanagement', 'department', 'Education Management', NULL, 'teached'),
+    ('earlyed', 'department', 'Early Education', NULL, 'teached'),
+  ('edpol', 'school', 'Educational Policy', NULL, 'education'),
+    ('edstudies', 'department', 'Policy Studies', NULL, 'edpol'),
+    ('edresearch', 'department', 'Educational Research', NULL, 'edpol'),
 ('business', 'university', 'Business', NULL, NULL),
   ('ethics', 'school', 'Business Ethics', NULL, 'business'),
   ('financial', 'school', 'Financial Analysis', NULL, 'financial'),
 
 INSERT INTO rd.course_classification (department, course, classification) VALUES
 ('astro', 137, 'astronomy'),
-('astro', 142, 'astro-lab'),
+('astro', 142, 'astrolab'),
 ('astro', 155, 'observation'),
-('astro', 254, 'astro-theory'),
+('astro', 254, 'astrotheory'),
 ('mth', 101, 'remedial'),
 ('chem', 100, 'remedial'),
 ('chem', 110, 'science'),
-('chem', 115, 'chem-lab'),
-('chem', 655, 'chem-theory'),
+('chem', 115, 'chemlab'),
+('chem', 655, 'chemtheory'),
 ('phys', 211, 'science'),
-('phys', 303, 'phys-theory'),
-('phys', 388, 'phys-lab'),
+('phys', 303, 'phystheory'),
+('phys', 388, 'physlab'),
 ('phys', 388, 'reasoning'),
-('phys', 512, 'phys-theory'),
-('phys', 713, 'phys-theory'),
-('phys', 819, 'phys-theory'),
+('phys', 512, 'phystheory'),
+('phys', 713, 'phystheory'),
+('phys', 819, 'phystheory'),
 ('eng', 101, 'remedial'),
-('eng', 247, 'euro-lit'),
-('eng', 311, 'non-fiction'),
+('eng', 247, 'eurolit'),
+('eng', 311, 'nonfiction'),
 ('eng', 175, 'journalism'),
 ('eng', 175, 'writing'),
-('eng', 276, 'non-fiction'),
+('eng', 276, 'nonfiction'),
 ('eng', 276, 'writing'),
-('eng', 412, 'non-fiction'),
+('eng', 412, 'nonfiction'),
 ('eng', 412, 'writing'),
-('hist', 112, 'am-history'),
-('hist', 212, 'am-history'),
-('hist', 415, 'disc-history'),
+('hist', 112, 'amhistory'),
+('hist', 212, 'amhistory'),
+('hist', 415, 'dischistory'),
 ('hist', 415, 'diversity'),
-('hist', 415, 'early-ed'),
-('hist', 333, 'disc-history'),
-('lang', 201, 'mod-language'),
-('lang', 203, 'mod-language'),
+('hist', 415, 'earlyed'),
+('hist', 333, 'dischistory'),
+('lang', 201, 'modlanguage'),
+('lang', 203, 'modlanguage'),
 ('lang', 207, 'linguistics'),
-('lang', 207, 'early-ed'),
+('lang', 207, 'earlyed'),
 ('lang', 305, 'linguistics'),
 ('psych', 102, 'remedial'),
-('psych', 304, 'cog-psych'),
+('psych', 304, 'cogpsych'),
 ('psych', 304, 'reasoning'),
-('psych', 450, 'beh-psych'),
-('psych', 560, 'cog-psych'),
-('psych', 560, 'comp-ai'),
-('psych', 610, 'chi-psych'),
-('psych', 610, 'early-ed'),
+('psych', 450, 'behpsych'),
+('psych', 560, 'cogpsych'),
+('psych', 560, 'compai'),
+('psych', 610, 'chipsych'),
+('psych', 610, 'earlyed'),
 ('psych', 610, 'research'),
 ('poli', 113, 'government'),
 ('poli', 402, 'government'),
-('poli', 644, 'int-relations'),
+('poli', 644, 'intrelations'),
 ('poli', 431, 'government'),
-('poli', 715, 'int-relations'),
+('poli', 715, 'intrelations'),
 ('comp', 102, 'remedial'),
-('comp', 230, 'comp-theory'),
-('comp', 350, 'comp-theory'),
-('comp', 615, 'comp-ai'),
-('comp', 819, 'comp-theory'),
-('comp', 710, 'soft-eng'),
-('comp', 810, 'soft-eng'),
-('ee', 107, 'ee-theory'),
-('ee', 202, 'ee-theory'),
-('ee', 412, 'ee-theory'),
-('ee', 505, 'ee-theory'),
-('ee', 615, 'ee-com'),
-('me', 344, 'me-mechanics'),
-('me', 111, 'me-mechanics'),
-('me', 627, 'me-mechanics'),
-('me', 501, 'me-systems'),
-('me', 712, 'me-design'),
+('comp', 230, 'comptheory'),
+('comp', 350, 'comptheory'),
+('comp', 615, 'compai'),
+('comp', 819, 'comptheory'),
+('comp', 710, 'softeng'),
+('comp', 810, 'softeng'),
+('ee', 107, 'eetheory'),
+('ee', 202, 'eetheory'),
+('ee', 412, 'eetheory'),
+('ee', 505, 'eetheory'),
+('ee', 615, 'eecom'),
+('me', 344, 'memechanics'),
+('me', 111, 'memechanics'),
+('me', 627, 'memechanics'),
+('me', 501, 'mesystems'),
+('me', 712, 'medesign'),
 ('me', 712, 'industrial'),
-('be', 112, 'be-general'),
-('be', 308, 'be-general'),
-('be', 415, 'be-clinical'),
-('be', 509, 'be-clinical'),
-('arthis', 712, 'art-bus'),
+('be', 112, 'begeneral'),
+('be', 308, 'begeneral'),
+('be', 415, 'beclinical'),
+('be', 509, 'beclinical'),
+('arthis', 712, 'artbus'),
 ('arthis', 202, 'modern'),
 ('arthis', 712, 'management'),
 ('arthis', 340, 'eastern'),
 ('artstd', 714, 'drawing'),
 ('artstd', 509, 'printmaking'),
 ('artstd', 411, 'sculpture'),
-('artstd', 411, 'phys-lab'),
+('artstd', 411, 'physlab'),
 ('artstd', 512, 'society'),
 ('artstd', 614, 'drawing'),
 ('artstd', 333, 'drawing'),
 ('artstd', 119, 'sculpture'),
 ('tched', 155, 'methods'),
-('tched', 367, 'ed-management'),
+('tched', 367, 'edmanagement'),
 ('tched', 367, 'management'),
-('tched', 501, 'early-ed'),
-('tched', 609, 'early-ed'),
-('tched', 122, 'early-ed'),
-('edpol', 202, 'ed-research'),
-('edpol', 551, 'ed-research'),
-('edpol', 313, 'ed-research'),
-('edpol', 313, 'am-history'),
-('edpol', 617, 'ed-studies'),
-('edpol', 505, 'ed-research'),
+('tched', 501, 'earlyed'),
+('tched', 609, 'earlyed'),
+('tched', 122, 'earlyed'),
+('edpol', 202, 'edresearch'),
+('edpol', 551, 'edresearch'),
+('edpol', 313, 'edresearch'),
+('edpol', 313, 'amhistory'),
+('edpol', 617, 'edstudies'),
+('edpol', 505, 'edresearch'),
 ('corpfi', 234, 'financial'),
 ('corpfi', 404, 'financial'),
 ('corpfi', 601, 'financial'),
 ;
 
 INSERT INTO rd.program_requirement (school, program, classification, credit_hours, rationale) VALUES 
-('ns', 'uastro', 'astro-lab', 8, 'Astronomy students are expected to take a minimum of 8 credit hours in the astronomy laboratory.'),
+('ns', 'uastro', 'astrolab', 8, 'Astronomy students are expected to take a minimum of 8 credit hours in the astronomy laboratory.'),
 ('ns', 'uastro', 'observation', 12, 'Undergraduate astronomy students will take a minimum of 12 credit hours of observational astronomy.'),
-('ns', 'uastro', 'astro-theory', 24, 'Undergraduate astronomy students will take a minimum of 12 credit hours of coursework on astronomy theory.'),
+('ns', 'uastro', 'astrotheory', 24, 'Undergraduate astronomy students will take a minimum of 12 credit hours of coursework on astronomy theory.'),
 ('ns', 'uastro', 'reasoning', 12, 'Undergraduate science students will take a minimum of 12 credit hours in general reasoning.'),
 ('ns', 'uastro', 'research', 12, 'B.S. candidates in the sciences will take a minimum of 12 credit hours in research techniques.'),
 ('ns', 'uastro', 'humanities', 16, 'B.S. candidates in the sciences will take a minimum of 16 credit hours in the humanities.'),
 ('ns', 'uastro', 'physics', 9, 'Undergraduate astronomy students will take a minimum of 9 credit hours in physics.'),
-('ns', 'uchem', 'chem-lab', 16, 'Undergraduate chemistry students must satisfy a minimum requirement for chemistry labwork.'),
-('ns', 'uchem', 'chem-theory', 18, 'Undergraduate chemistry students must satisfy a minimum requirement for chemistry theory.'),
+('ns', 'uchem', 'chemlab', 16, 'Undergraduate chemistry students must satisfy a minimum requirement for chemistry labwork.'),
+('ns', 'uchem', 'chemtheory', 18, 'Undergraduate chemistry students must satisfy a minimum requirement for chemistry theory.'),
 ('ns', 'uchem', 'reasoning', 12, 'Undergraduate science students will take a minimum of 12 credit hours in general reasoning.'),
 ('ns', 'uchem', 'research', 12, 'B.S. candidates in the sciences will take a minimum of 12 credit hours in research techniques.'),
 ('ns', 'uchem', 'humanities', 16, 'B.S. candidates in the sciences will take a minimum of 16 credit hours in the humanities.'),
-('ns', 'uphys', 'phys-theory', 26, 'Candidates for the B.S. in physics must take a minimum of 26 hours of physics theory.'),
-('ns', 'uphys', 'phys-lab', 12, 'Candidates for the B.S. in physics must take a minimum of 12 hours of physics labwork.'),
+('ns', 'uphys', 'phystheory', 26, 'Candidates for the B.S. in physics must take a minimum of 26 hours of physics theory.'),
+('ns', 'uphys', 'physlab', 12, 'Candidates for the B.S. in physics must take a minimum of 12 hours of physics labwork.'),
 ('ns', 'uphys', 'humanities', 16, 'B.S. candidates in the sciences will take a minimum of 12 credit hours in the humanities.'),
 ('ns', 'uphys', 'science', 12, 'Physics majors are expected to take a minimum of 12 credit hours in other scientific disciplines.'),
-('la', 'upsych', 'psychology', 24, 'Psychology majors must take the minimum credit hours in one or more of the three major psychology concentrations--cognitive, behavioral, or child.'),
+('la', 'upsych', 'psychology', 24, 'Psychology majors must take the minimum credit hours in one or more of the three major psychology concentrationscognitive, behavioral, or child.'),
 ('la', 'upsych', 'writing', 12, 'Psychology majors must take a minimum of 12 credit hours in writing.'),
 ('la', 'upsych', 'diversity', 16, 'In recognition of the importance of diversity in modern society, undergraduate humanities majors must take a minimum of 16 credits hours of course emphasizing cultural diversity.'),
 ('la', 'upsych', 'reasoning', 6, 'B.A. candidates in the humanities will take a minimum of two courses emphasizing reasoning.'),
 ('la', 'upolisci', 'government', 16, 'Political Science majors will take at least 16 credit hours of coursework in world government'),
-('la', 'upolisci', 'int-relations', 12, 'Political Science majors will take at least 12 credit hours of coursework in international relations.'),
-('la', 'upolisci', 'poli-econ', 12, 'Political Science majors will take at least 12 credit hours of coursework in political economy.'),
+('la', 'upolisci', 'intrelations', 12, 'Political Science majors will take at least 12 credit hours of coursework in international relations.'),
+('la', 'upolisci', 'poliecon', 12, 'Political Science majors will take at least 12 credit hours of coursework in political economy.'),
 ('la', 'upolisci', 'writing', 12, 'Political science majors must take a minimum of 12 credit hours in writing.'),
 ('la', 'upolisci', 'diversity', 16, 'In recognition of the importance of diversity in modern society, undergraduate humanities majors must take a minimum of 16 credits hours of course emphasizing cultural diversity.'),
 ('la', 'upolisci', 'reasoning', 6, 'B.A. candidates in the humanities will take a minimum of two courses emphasizing reasoning.'),
 ('la', 'gscitch', 'science', 18, 'M.S. candidates for the science teaching degree who do not have undergraduate degrees in science must take a minimum of 18 credit hours in one scientific discipline.'),
 ('la', 'gscitch', 'methods', 18, 'M.S. candidates should complete a minimum of 18 credit hours focused on teaching methods.'),
-('la', 'gscitch', 'early-ed', 12, 'M.S. candidates will take a minimum of 12 hours of early childhood education instruction.'),
-('la', 'psciwri', 'science', 12, 'Candidates for the Certificate in Science Writing will take four three-hour classes in general science.'),
-('la', 'psciwri', 'journalism', 12, 'Candidates will take four three-hour classes in writing focused on scientific journalism'),
+('la', 'gscitch', 'earlyed', 12, 'M.S. candidates will take a minimum of 12 hours of early childhood education instruction.'),
+('la', 'psciwri', 'science', 12, 'Candidates for the Certificate in Science Writing will take four threehour classes in general science.'),
+('la', 'psciwri', 'journalism', 12, 'Candidates will take four threehour classes in writing focused on scientific journalism'),
 ('la', 'gengl', 'literature', 36, 'Candidates for the M.A. in English will take a minimum of 36 credit hours of literature courses.'),
 ('la', 'uengl', 'literature', 30, 'B.A. candidates in English are expected to take 30 credit hours in general literature.'),
-('la', 'uengl', 'euro-lit', 12, 'B.A. candidates in English are expected to take three courses in European literature.'),
+('la', 'uengl', 'eurolit', 12, 'B.A. candidates in English are expected to take three courses in European literature.'),
 ('la', 'uengl', 'reasoning', 6, 'B.A. candidates in the humanities will take a minimum of two courses emphasizing reasoning.'),
 ('la', 'uengl', 'humanities', 16, 'B.A. candidates in the humanities will take a minimum of 16 credit hours in general humanities outside their major.'),
-('la', 'uengl', 'mod-language', 16, 'B.A. candidates in the humanities will take a minimum of two years of a modern language of their choice.'),
+('la', 'uengl', 'modlanguage', 16, 'B.A. candidates in the humanities will take a minimum of two years of a modern language of their choice.'),
 ('la', 'uhist', 'diversity', 16, 'In recognition of the importance of diversity in modern society, undergraduate humanities majors must take a minimum of 16 credits hours of course emphasizing cultural diversity.'),
 ('la', 'uspan', 'spanish', 24, 'Spanish majors will take a minimum of 24 credit hours in the Spanish majors.'),
 ('la', 'uspan', 'reasoning', 6, 'B.A. candidates in the humanities will take a minimum of two courses emphasizing reasoning.'),
 ('la', 'uspan', 'humanities', 16, 'B.A. candidates in the humanities will take a minimum of 16 credit hours in general humanities outside their major.'),
-('la', 'uspan', 'mod-language', 16, 'B.A. candidates in the humanities will take a minimum of two years of a modern language of their choice.'),
+('la', 'uspan', 'modlanguage', 16, 'B.A. candidates in the humanities will take a minimum of two years of a modern language of their choice.'),
 ('la', 'uspan', 'diversity', 16, 'In recognition of the importance of diversity in modern society, undergraduate humanities majors must take a minimum of 16 credits hours of course emphasizing cultural diversity.'),
 ('la', 'glang', 'language', 22, 'Candidates for the Master of Arts in Modern Languages must take a minimum of 22 credit hours in the modern language of their concentration.'),
-('egn', 'uelec', 'ee-theory', 18, 'Bachelor of Engineering candidates in Electrical Engineering are expected to take at least 18 hours of credit in EE theory.'),
-('egn', 'uelec', 'ee-concentration', 22, 'Bachelor of Engineering candidates in Electrical Engineering are expected to take at least 22 hours of credit in their area of concentration.'),
-('egn', 'uelec', 'comp-sci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
-('egn', 'umech', 'me', 22, 'Bachelor of Engineering candidates in Mechanical Engineering are expected to take at least 22 hours of credit in their area of concentration--mechanics, de sign, or systems.'),
-('egn', 'umech', 'me-systems', 9, 'Bachelor of Engineering candidates in Mechanical Engineering are expected to take at least 9 hours of credit in systems, regardless of their area of concentration.'),
-('egn', 'umech', 'comp-sci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
+('egn', 'uelec', 'eetheory', 18, 'Bachelor of Engineering candidates in Electrical Engineering are expected to take at least 18 hours of credit in EE theory.'),
+('egn', 'uelec', 'eeconcentration', 22, 'Bachelor of Engineering candidates in Electrical Engineering are expected to take at least 22 hours of credit in their area of concentration.'),
+('egn', 'uelec', 'compsci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
+('egn', 'umech', 'me', 22, 'Bachelor of Engineering candidates in Mechanical Engineering are expected to take at least 22 hours of credit in their area of concentrationmechanics, de sign, or systems.'),
+('egn', 'umech', 'mesystems', 9, 'Bachelor of Engineering candidates in Mechanical Engineering are expected to take at least 9 hours of credit in systems, regardless of their area of concentration.'),
+('egn', 'umech', 'compsci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
 ('egn', 'umech', 'humanities', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in general humanities.'),
-('egn', 'ubio', 'be', 24, 'Bachelor of Engineering candidates in Bioengineering are expected to take at least 24 hours of credit in their area of concentration--clinical, nanotech, orbiomaterials'),
-('egn', 'ubio', 'me-systems', 10, 'Bachelor of Engineering candidates in Bioengineering are expected to take at least 9 hours of credit in biomaterials, regardless of their area of concentration.'),
-('egn', 'ubio', 'comp-sci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
+('egn', 'ubio', 'be', 24, 'Bachelor of Engineering candidates in Bioengineering are expected to take at least 24 hours of credit in their area of concentrationclinical, nanotech, orbiomaterials'),
+('egn', 'ubio', 'mesystems', 10, 'Bachelor of Engineering candidates in Bioengineering are expected to take at least 9 hours of credit in biomaterials, regardless of their area of concentration.'),
+('egn', 'ubio', 'compsci', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in computer science and/or programming related to their major.'),
 ('egn', 'ubio', 'humanities', 12, 'Bachelor of Engineering candidates are expected to take at least 12 hours of credit in general humanities.'),
 ('egn', 'gbuseng', 'business', 16, 'Candidates for the Master of Science in Business and Engineering are required to take at least 16 credit hours in general business.'),
 ('egn', 'gbuseng', 'engineering', 22, 'Candidates for the Master of Science in Business and Engineering are required to take at least 22 credit hours in one or more relevant engineering disciplines.'),
 ('egn', 'gee', 'ee', 34, 'Candidates for the Master of Science in Electrical Engineering must take at least 34 credit hours in graduate electrical engineering.'),
 ('egn', 'gme', 'ee', 36, 'Candidates for the Master of Science in Electrical Engineering must take at least 36 credit hours in graduate electrical engineering.'),
 ('egn', 'gbe', 'ee', 38, 'Candidates for the Master of Science in Electrical Engineering must take at least 38 credit hours in graduate electrical engineering.'),
-('edu', 'umath', 'teach-ed', 20, 'Bachelor of Arts students in Math Education must take at least 20 credit hours of general teacher education.'),
+('edu', 'umath', 'teached', 20, 'Bachelor of Arts students in Math Education must take at least 20 credit hours of general teacher education.'),
 ('edu', 'umath', 'math', 16, 'Bachelor of Arts students in Science Education must take at least 16 hours of general math.'),
 ('edu', 'umath', 'diversity', 8, 'In acknowledgement of the importance of diversity in education, all candidates for education degrees must take at least 8 credit hours in diverse cultures and history.'),
-('edu', 'usci', 'teach-ed', 22, 'Bachelor of Arts students in Science Education must take at least 22 credit hours of general science education.'),
+('edu', 'usci', 'teached', 22, 'Bachelor of Arts students in Science Education must take at least 22 credit hours of general science education.'),
 ('edu', 'usci', 'science', 14, 'Bachelor of Arts students in Science Education must take at least 14 hours of general science.'),
 ('edu', 'usci', 'diversity', 8, 'In acknowledgement of the importance of diversity in education, all candidates for education degrees must take at least 8 credit hours in diverse cultures and history.'),
 ('edu', 'psci', 'methods', 12, 'Candidates for the Certificate in Science Teaching are required to take a minimum number of credit hours in teaching methods.'),
 ('edu', 'psci', 'science', 12, 'Candidates for the Certificate in Science Teaching are required to take a minimum number of credit hours in general science.'),
-('edu', 'glited', 'teach-ed', 28, 'Candidates for the Master of Arts in Literacy Education will take the majority of their credit hours in teacher education, focusing on literacy.'),
-('edu', 'gedlead', 'ed-pol', 20, 'Candidates for the Master of Arts in Educational Leadership will concentrate in educational policy.'),
+('edu', 'glited', 'teached', 28, 'Candidates for the Master of Arts in Literacy Education will take the majority of their credit hours in teacher education, focusing on literacy.'),
+('edu', 'gedlead', 'edpol', 20, 'Candidates for the Master of Arts in Educational Leadership will concentrate in educational policy.'),
 ('edu', 'gedlead', 'management', 8, 'Candidates for the Master of Arts in Educational Leadership will take a minimum number of credit hours in management at the School of Business.'),
-('edu', 'gedu', 'ed-research', 22, 'Candidates for the Master of Science in Education will focus on a core requirement of education-related research leading up to the master''s thesis.'),
-('edu', 'gtch', 'teach-ed', 28, 'Candidates for the Master of Arts in Teaching will concentrate on the study of teaching methods in their chosen concentration.'),
+('edu', 'gedu', 'edresearch', 22, 'Candidates for the Master of Science in Education will focus on a core requirement of educationrelated research leading up to the master''s thesis.'),
+('edu', 'gtch', 'teached', 28, 'Candidates for the Master of Arts in Teaching will concentrate on the study of teaching methods in their chosen concentration.'),
 ('bus', 'uacct', 'accounting', 24, 'Students pursuing the B.S. in Accounting will take the majority of their credit hours in accounting.'),
 ('bus', 'uacct', 'investment', 8, 'Students pursuing the B.S. in Accounting must take at least 8 credit hours in general investment topics.'),
 ('bus', 'uacct', 'analysis', 8, 'Students pursuing the B.S. in Accounting must take at least 8 credit hours of relevant mathematics.'),
 ('bus', 'ubusad', 'ethics', 12, 'Students pursuing any undergraduate degree in business will be required to meet a core requirement in business ethics.'),
 ('bus', 'pacc', 'accounting', 20, 'Requirements for the Graduate Certificate in Accounting require a minimum number of credit hours in accounting and accounting theory.'),
 ('bus', 'pcap', 'markets', 20, 'Requirements for the Certificate in Capital Markets include completion of a minimum number of credit hours in markets topics.'),
-('art', 'gart', 'art-history', 20, 'Candidates for the Post Baccalaureate in Art History must complete a minimum number of core art history courses.'),
+('art', 'gart', 'arthistory', 20, 'Candidates for the Post Baccalaureate in Art History must complete a minimum number of core art history courses.'),
 ('art', 'uhist', 'classical', 9, 'Students in the undergraduate Art History program are required to take 9 credit hours of study of classical art.'),
 ('art', 'uhist', 'modern', 9, 'Students in the undergraduate Art History program are required to take 9 credit hours of study of modern art.'),
 ('art', 'uhist', 'eastern', 6, 'Students in the undergraduate Art History program are required to take 9 credit hours of study of eastern art.'),
-('art', 'uhist', 'art-history', 14, 'Students in the undergraduate Art History program are required to take 9 credit hours of elective classes in art history.'),
-('art', 'ustudio', 'art-studio', 24, 'Students in the undergraduate Studio Art program will concentrate on their selected studio discipline.'),
+('art', 'uhist', 'arthistory', 14, 'Students in the undergraduate Art History program are required to take 9 credit hours of elective classes in art history.'),
+('art', 'ustudio', 'artstudio', 24, 'Students in the undergraduate Studio Art program will concentrate on their selected studio discipline.'),
 ('art', 'ustudio', 'drawing', 8, 'All Studio Art undergraduate students must take a minimum 8 hours of credit in freehand drawing.'),
 ('art', 'ustudio', 'society', 6, 'All Studio Art undergraduate students must take a minimum of 6 hours of credit in Art & Society.'),
 ('art', 'ustudio', 'digital', 6, 'All Studio Art undergraduate students must take a minimum of 6 hours of credit in Digital Art.'),
 ('mart', 'bmart', 'classical', 9, 'Students in the undergraduate Modern Art program are required to take 9 credit hours of study of classical art.'),
 ('mart', 'bmart', 'modern', 24, 'Students in the undergraduate Modern Art program are required to take 24 credit hours of study of modern art.'),
-('mart', 'bmart', 'art-history', 10, 'Students in the undergraduate Modern Art program are required to take 10 credit hours of elective classes in art history.')
+('mart', 'bmart', 'arthistory', 10, 'Students in the undergraduate Modern Art program are required to take 10 credit hours of elective classes in art history.')
 ;