diff --git a/Repositories/otago_eprints/otago_eprints/cfg/subjects b/Repositories/otago_eprints/otago_eprints/cfg/subjects
index 645da96..cee0253 100755
--- a/Repositories/otago_eprints/otago_eprints/cfg/subjects
+++ b/Repositories/otago_eprints/otago_eprints/cfg/subjects
@@ -27,6 +27,10 @@
 #
 # UNIVERSITY OF OTAGO ORGANISATIONAL UNITS
 #
+# Note: avoid 2-letter keys so that there is no
+# chance of clashing with the Library of Congress
+# subjects!
+#
 ###################################################
 affiliations:University of Otago:ROOT:0
 
@@ -34,7 +38,7 @@
 #
 # School of Business
 #
-SoB:School of Business:OU:0
+SoB:School of Business:affiliations:0
 
 # Office of the Dean
 SoB_Dean:Office of the Dean:SoB:1
@@ -92,67 +96,67 @@
 #
 # Division of Health Sciences
 #
-Health_Sci:Division of Health Sciences:OU:0
+Health_Sci:Division of Health Sciences:affiliations:0
 
 ###################################################
 #
 # Division of Humanities
 #
-Humanities:Division of Humanities:OU:0
+Humanities:Division of Humanities:affiliations:0
 
 ###################################################
 #
 # Division of Sciences
 #
-Sciences:Division of Sciences:OU:0
+Sciences:Division of Sciences:affiliations:0
 
 ###################################################
 #
 # Academic
 #
-Academic:Academic Division:OU:0
+Academic:Academic Division:affiliations:0
 
 ###################################################
 #
 # Financial Services
 #
-Finc_Services:Financial Services Division:OU:0
+Finc_Services:Financial Services Division:affiliations:0
 
 ###################################################
 #
 # Human Resources
 #
-HR:Human Resources Division:OU:0
+Human_Res:Human Resources Division:affiliations:0
 
 ###################################################
 #
 # Information Services
 #
-IS:Information Services Division:0
+Info_Services:Information Services Division:0
 
 ###################################################
 #
 # Marketing & Communications
 #
-Mktg_Comms:Marketing & Communications Division:OU:0
+Mktg_Comms:Marketing & Communications Division:affiliations:0
 
 ###################################################
 #
 # Property Services
 #
-Prop_Services:Property Services Division:OU:0
+Prop_Services:Property Services Division:affiliations:0
 
 ###################################################
 #
 # Research
 #
-Research:Research Division:OU:0
+Research:Research Division:affiliations:0
 
 ###################################################
 #
 # Student Services
 #
-Stud_Services:Student Services Division:OU:0
+Stud_Services:Student Services Division:affiliations:0
 
 
 ###################################################