diff --git a/Data/TeacherCount.json b/Data/TeacherCount.json
index 677c671..81d2bb3 100644
--- a/Data/TeacherCount.json
+++ b/Data/TeacherCount.json
@@ -207,7 +207,7 @@
         "rural_teacher": 98761
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 118187,
         "urban_staff": 15802,
@@ -309,7 +309,7 @@
         "rural_teacher": 33387
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 80641,
         "urban_staff": 29393,
@@ -662,7 +662,7 @@
         "rural_teacher": 5247
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 14454,
         "urban_staff": 6137,
@@ -764,7 +764,7 @@
         "rural_teacher": 1423
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 14945,
         "urban_staff": 11285,
@@ -1117,7 +1117,7 @@
         "rural_teacher": 173
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 833,
         "urban_staff": 688,
@@ -1219,7 +1219,7 @@
         "rural_teacher": 104
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 3209,
         "urban_staff": 3209,
@@ -1572,7 +1572,7 @@
         "rural_teacher": 216
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1075,
         "urban_staff": 1075,
@@ -1674,7 +1674,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1287,
         "urban_staff": 1265,
@@ -2027,7 +2027,7 @@
         "rural_teacher": 172
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1717,
         "urban_staff": 1591,
@@ -2129,7 +2129,7 @@
         "rural_teacher": 60
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 3484,
         "urban_staff": 3080,
@@ -2482,7 +2482,7 @@
         "rural_teacher": 231
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1233,
         "urban_staff": 1058,
@@ -2584,7 +2584,7 @@
         "rural_teacher": 164
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1481,
         "urban_staff": 1481,
@@ -2937,7 +2937,7 @@
         "rural_teacher": 229
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 786,
         "urban_staff": 280,
@@ -3039,7 +3039,7 @@
         "rural_teacher": 18
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 448,
         "urban_staff": 448,
@@ -3392,7 +3392,7 @@
         "rural_teacher": 277
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 401,
         "urban_staff": 368,
@@ -3494,7 +3494,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 881,
         "urban_staff": 881,
@@ -3847,7 +3847,7 @@
         "rural_teacher": 440
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1012,
         "urban_staff": 0,
@@ -3949,7 +3949,7 @@
         "rural_teacher": 152
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 296,
         "urban_staff": 0,
@@ -4302,7 +4302,7 @@
         "rural_teacher": 126
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 442,
         "urban_staff": 0,
@@ -4404,7 +4404,7 @@
         "rural_teacher": 82
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 296,
         "urban_staff": 0,
@@ -4757,7 +4757,7 @@
         "rural_teacher": 546
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1074,
         "urban_staff": 0,
@@ -4859,7 +4859,7 @@
         "rural_teacher": 106
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 410,
         "urban_staff": 0,
@@ -5212,7 +5212,7 @@
         "rural_teacher": 312
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 825,
         "urban_staff": 0,
@@ -5314,7 +5314,7 @@
         "rural_teacher": 201
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 310,
         "urban_staff": 0,
@@ -5667,7 +5667,7 @@
         "rural_teacher": 793
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 936,
         "urban_staff": 0,
@@ -5769,7 +5769,7 @@
         "rural_teacher": 194
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 404,
         "urban_staff": 0,
@@ -6122,7 +6122,7 @@
         "rural_teacher": 490
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1189,
         "urban_staff": 0,
@@ -6224,7 +6224,7 @@
         "rural_teacher": 75
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 430,
         "urban_staff": 0,
@@ -6577,7 +6577,7 @@
         "rural_teacher": 1164
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1854,
         "urban_staff": 0,
@@ -6679,7 +6679,7 @@
         "rural_teacher": 231
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1088,
         "urban_staff": 0,
@@ -7032,7 +7032,7 @@
         "rural_teacher": 78
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1077,
         "urban_staff": 1077,
@@ -7134,7 +7134,7 @@
         "rural_teacher": 36
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 921,
         "urban_staff": 921,
@@ -7487,7 +7487,7 @@
         "rural_teacher": 13282
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 16199,
         "urban_staff": 2029,
@@ -7589,7 +7589,7 @@
         "rural_teacher": 3809
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 10797,
         "urban_staff": 3977,
@@ -7942,7 +7942,7 @@
         "rural_teacher": 1235
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1995,
         "urban_staff": 1354,
@@ -8044,7 +8044,7 @@
         "rural_teacher": 296
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1797,
         "urban_staff": 1712,
@@ -8397,7 +8397,7 @@
         "rural_teacher": 257
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 645,
         "urban_staff": 0,
@@ -8499,7 +8499,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 308,
         "urban_staff": 0,
@@ -8852,7 +8852,7 @@
         "rural_teacher": 2028
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1350,
         "urban_staff": 0,
@@ -8954,7 +8954,7 @@
         "rural_teacher": 618
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1734,
         "urban_staff": 0,
@@ -9307,7 +9307,7 @@
         "rural_teacher": 1016
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 905,
         "urban_staff": 0,
@@ -9409,7 +9409,7 @@
         "rural_teacher": 261
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 569,
         "urban_staff": 0,
@@ -9762,7 +9762,7 @@
         "rural_teacher": 1602
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1565,
         "urban_staff": 0,
@@ -9864,7 +9864,7 @@
         "rural_teacher": 463
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 646,
         "urban_staff": 0,
@@ -10217,7 +10217,7 @@
         "rural_teacher": 1739
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 2122,
         "urban_staff": 0,
@@ -10319,7 +10319,7 @@
         "rural_teacher": 50
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1233,
         "urban_staff": 0,
@@ -10672,7 +10672,7 @@
         "rural_teacher": 2413
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 2541,
         "urban_staff": 0,
@@ -10774,7 +10774,7 @@
         "rural_teacher": 891
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1060,
         "urban_staff": 0,
@@ -11127,7 +11127,7 @@
         "rural_teacher": 835
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1461,
         "urban_staff": 0,
@@ -11229,7 +11229,7 @@
         "rural_teacher": 518
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 882,
         "urban_staff": 0,
@@ -11582,7 +11582,7 @@
         "rural_teacher": 2157
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 3615,
         "urban_staff": 675,
@@ -11684,7 +11684,7 @@
         "rural_teacher": 712
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2568,
         "urban_staff": 2265,
@@ -12037,7 +12037,7 @@
         "rural_teacher": 3847
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 6946,
         "urban_staff": 837,
@@ -12139,7 +12139,7 @@
         "rural_teacher": 1214
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 3141,
         "urban_staff": 945,
@@ -12492,7 +12492,7 @@
         "rural_teacher": 377
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1531,
         "urban_staff": 837,
@@ -12594,7 +12594,7 @@
         "rural_teacher": 201
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 945,
         "urban_staff": 945,
@@ -12947,7 +12947,7 @@
         "rural_teacher": 485
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 899,
         "urban_staff": 0,
@@ -13049,7 +13049,7 @@
         "rural_teacher": 178
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 355,
         "urban_staff": 0,
@@ -13402,7 +13402,7 @@
         "rural_teacher": 350
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 436,
         "urban_staff": 0,
@@ -13504,7 +13504,7 @@
         "rural_teacher": 110
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 158,
         "urban_staff": 0,
@@ -13857,7 +13857,7 @@
         "rural_teacher": 462
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 782,
         "urban_staff": 0,
@@ -13959,7 +13959,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 385,
         "urban_staff": 0,
@@ -14312,7 +14312,7 @@
         "rural_teacher": 506
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 556,
         "urban_staff": 0,
@@ -14414,7 +14414,7 @@
         "rural_teacher": 45
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 291,
         "urban_staff": 0,
@@ -14767,7 +14767,7 @@
         "rural_teacher": 351
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 577,
         "urban_staff": 0,
@@ -14869,7 +14869,7 @@
         "rural_teacher": 91
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 163,
         "urban_staff": 0,
@@ -15222,7 +15222,7 @@
         "rural_teacher": 262
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 596,
         "urban_staff": 0,
@@ -15324,7 +15324,7 @@
         "rural_teacher": 92
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 332,
         "urban_staff": 0,
@@ -15677,7 +15677,7 @@
         "rural_teacher": 593
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 925,
         "urban_staff": 0,
@@ -15779,7 +15779,7 @@
         "rural_teacher": 207
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 251,
         "urban_staff": 0,
@@ -16132,7 +16132,7 @@
         "rural_teacher": 461
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 644,
         "urban_staff": 0,
@@ -16234,7 +16234,7 @@
         "rural_teacher": 290
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 261,
         "urban_staff": 0,
@@ -16587,7 +16587,7 @@
         "rural_teacher": 6324
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 5252,
         "urban_staff": 201,
@@ -16689,7 +16689,7 @@
         "rural_teacher": 2819
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 6212,
         "urban_staff": 1103,
@@ -17042,7 +17042,7 @@
         "rural_teacher": 1904
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1434,
         "urban_staff": 201,
@@ -17144,7 +17144,7 @@
         "rural_teacher": 1167
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2626,
         "urban_staff": 1103,
@@ -17497,7 +17497,7 @@
         "rural_teacher": 935
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 813,
         "urban_staff": 0,
@@ -17599,7 +17599,7 @@
         "rural_teacher": 330
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 571,
         "urban_staff": 0,
@@ -17952,7 +17952,7 @@
         "rural_teacher": 1690
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1427,
         "urban_staff": 0,
@@ -18054,7 +18054,7 @@
         "rural_teacher": 689
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1709,
         "urban_staff": 0,
@@ -18407,7 +18407,7 @@
         "rural_teacher": 1138
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 642,
         "urban_staff": 0,
@@ -18509,7 +18509,7 @@
         "rural_teacher": 454
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 652,
         "urban_staff": 0,
@@ -18862,7 +18862,7 @@
         "rural_teacher": 657
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 936,
         "urban_staff": 0,
@@ -18964,7 +18964,7 @@
         "rural_teacher": 179
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 654,
         "urban_staff": 0,
@@ -19317,7 +19317,7 @@
         "rural_teacher": 12983
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 13005,
         "urban_staff": 498,
@@ -19419,7 +19419,7 @@
         "rural_teacher": 5277
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 9277,
         "urban_staff": 1830,
@@ -19772,7 +19772,7 @@
         "rural_teacher": 1489
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1858,
         "urban_staff": 498,
@@ -19874,7 +19874,7 @@
         "rural_teacher": 551
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2173,
         "urban_staff": 1830,
@@ -20227,7 +20227,7 @@
         "rural_teacher": 1061
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 965,
         "urban_staff": 0,
@@ -20329,7 +20329,7 @@
         "rural_teacher": 286
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 590,
         "urban_staff": 0,
@@ -20682,7 +20682,7 @@
         "rural_teacher": 1205
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1362,
         "urban_staff": 0,
@@ -20784,7 +20784,7 @@
         "rural_teacher": 530
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 627,
         "urban_staff": 0,
@@ -21137,7 +21137,7 @@
         "rural_teacher": 1198
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 823,
         "urban_staff": 0,
@@ -21239,7 +21239,7 @@
         "rural_teacher": 646
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 748,
         "urban_staff": 0,
@@ -21592,7 +21592,7 @@
         "rural_teacher": 670
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 571,
         "urban_staff": 0,
@@ -21694,7 +21694,7 @@
         "rural_teacher": 399
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 345,
         "urban_staff": 0,
@@ -22047,7 +22047,7 @@
         "rural_teacher": 676
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1288,
         "urban_staff": 0,
@@ -22149,7 +22149,7 @@
         "rural_teacher": 149
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 581,
         "urban_staff": 0,
@@ -22502,7 +22502,7 @@
         "rural_teacher": 248
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 378,
         "urban_staff": 0,
@@ -22604,7 +22604,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 251,
         "urban_staff": 0,
@@ -22957,7 +22957,7 @@
         "rural_teacher": 3770
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 3431,
         "urban_staff": 0,
@@ -23059,7 +23059,7 @@
         "rural_teacher": 1938
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2261,
         "urban_staff": 0,
@@ -23412,7 +23412,7 @@
         "rural_teacher": 1372
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1081,
         "urban_staff": 0,
@@ -23514,7 +23514,7 @@
         "rural_teacher": 490
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 660,
         "urban_staff": 0,
@@ -23867,7 +23867,7 @@
         "rural_teacher": 1220
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1022,
         "urban_staff": 0,
@@ -23969,7 +23969,7 @@
         "rural_teacher": 288
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 575,
         "urban_staff": 0,
@@ -24322,7 +24322,7 @@
         "rural_teacher": 74
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 226,
         "urban_staff": 0,
@@ -24424,7 +24424,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 466,
         "urban_staff": 0,
@@ -24777,7 +24777,7 @@
         "rural_teacher": 2790
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 4178,
         "urban_staff": 856,
@@ -24879,7 +24879,7 @@
         "rural_teacher": 502
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2276,
         "urban_staff": 516,
@@ -25232,7 +25232,7 @@
         "rural_teacher": 92
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 902,
         "urban_staff": 856,
@@ -25334,7 +25334,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 516,
         "urban_staff": 516,
@@ -25687,7 +25687,7 @@
         "rural_teacher": 600
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 622,
         "urban_staff": 0,
@@ -25789,7 +25789,7 @@
         "rural_teacher": 98
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 452,
         "urban_staff": 0,
@@ -26142,7 +26142,7 @@
         "rural_teacher": 1022
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1271,
         "urban_staff": 0,
@@ -26244,7 +26244,7 @@
         "rural_teacher": 167
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 569,
         "urban_staff": 0,
@@ -26597,7 +26597,7 @@
         "rural_teacher": 400
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 488,
         "urban_staff": 0,
@@ -26699,7 +26699,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 251,
         "urban_staff": 0,
@@ -27052,7 +27052,7 @@
         "rural_teacher": 676
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 895,
         "urban_staff": 0,
@@ -27154,7 +27154,7 @@
         "rural_teacher": 237
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 488,
         "urban_staff": 0,
@@ -27507,7 +27507,7 @@
         "rural_teacher": 4307
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 5741,
         "urban_staff": 417,
@@ -27609,7 +27609,7 @@
         "rural_teacher": 1269
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 3945,
         "urban_staff": 819,
@@ -27962,7 +27962,7 @@
         "rural_teacher": 370
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 655,
         "urban_staff": 417,
@@ -28064,7 +28064,7 @@
         "rural_teacher": 48
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 819,
         "urban_staff": 819,
@@ -28417,7 +28417,7 @@
         "rural_teacher": 288
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 720,
         "urban_staff": 0,
@@ -28519,7 +28519,7 @@
         "rural_teacher": 96
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 275,
         "urban_staff": 0,
@@ -28872,7 +28872,7 @@
         "rural_teacher": 309
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1063,
         "urban_staff": 0,
@@ -28974,7 +28974,7 @@
         "rural_teacher": 208
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 379,
         "urban_staff": 0,
@@ -29327,7 +29327,7 @@
         "rural_teacher": 606
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 702,
         "urban_staff": 0,
@@ -29429,7 +29429,7 @@
         "rural_teacher": 151
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 443,
         "urban_staff": 0,
@@ -29782,7 +29782,7 @@
         "rural_teacher": 515
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 436,
         "urban_staff": 0,
@@ -29884,7 +29884,7 @@
         "rural_teacher": 181
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 601,
         "urban_staff": 0,
@@ -30237,7 +30237,7 @@
         "rural_teacher": 155
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 435,
         "urban_staff": 0,
@@ -30339,7 +30339,7 @@
         "rural_teacher": 46
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 458,
         "urban_staff": 0,
@@ -30692,7 +30692,7 @@
         "rural_teacher": 235
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 209,
         "urban_staff": 0,
@@ -30794,7 +30794,7 @@
         "rural_teacher": 22
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 170,
         "urban_staff": 0,
@@ -31147,7 +31147,7 @@
         "rural_teacher": 245
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 331,
         "urban_staff": 0,
@@ -31249,7 +31249,7 @@
         "rural_teacher": 31
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 146,
         "urban_staff": 0,
@@ -31602,7 +31602,7 @@
         "rural_teacher": 1306
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 973,
         "urban_staff": 0,
@@ -31704,7 +31704,7 @@
         "rural_teacher": 486
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 530,
         "urban_staff": 0,
@@ -32057,7 +32057,7 @@
         "rural_teacher": 278
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 217,
         "urban_staff": 0,
@@ -32159,7 +32159,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 124,
         "urban_staff": 0,
@@ -32512,7 +32512,7 @@
         "rural_teacher": 6891
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 5078,
         "urban_staff": 85,
@@ -32614,7 +32614,7 @@
         "rural_teacher": 2445
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 3627,
         "urban_staff": 1118,
@@ -32967,7 +32967,7 @@
         "rural_teacher": 786
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 575,
         "urban_staff": 85,
@@ -33069,7 +33069,7 @@
         "rural_teacher": 412
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1171,
         "urban_staff": 1118,
@@ -33422,7 +33422,7 @@
         "rural_teacher": 1098
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 915,
         "urban_staff": 0,
@@ -33524,7 +33524,7 @@
         "rural_teacher": 376
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 681,
         "urban_staff": 0,
@@ -33877,7 +33877,7 @@
         "rural_teacher": 1209
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 949,
         "urban_staff": 0,
@@ -33979,7 +33979,7 @@
         "rural_teacher": 317
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 323,
         "urban_staff": 0,
@@ -34332,7 +34332,7 @@
         "rural_teacher": 1111
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 671,
         "urban_staff": 0,
@@ -34434,7 +34434,7 @@
         "rural_teacher": 463
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 466,
         "urban_staff": 0,
@@ -34787,7 +34787,7 @@
         "rural_teacher": 561
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 452,
         "urban_staff": 0,
@@ -34889,7 +34889,7 @@
         "rural_teacher": 223
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 158,
         "urban_staff": 0,
@@ -35242,7 +35242,7 @@
         "rural_teacher": 653
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 349,
         "urban_staff": 0,
@@ -35344,7 +35344,7 @@
         "rural_teacher": 154
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 267,
         "urban_staff": 0,
@@ -35697,7 +35697,7 @@
         "rural_teacher": 904
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 591,
         "urban_staff": 0,
@@ -35799,7 +35799,7 @@
         "rural_teacher": 288
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 350,
         "urban_staff": 0,
@@ -36152,7 +36152,7 @@
         "rural_teacher": 569
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 576,
         "urban_staff": 0,
@@ -36254,7 +36254,7 @@
         "rural_teacher": 212
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 211,
         "urban_staff": 0,
@@ -36607,7 +36607,7 @@
         "rural_teacher": 4231
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 7073,
         "urban_staff": 565,
@@ -36709,7 +36709,7 @@
         "rural_teacher": 955
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 4206,
         "urban_staff": 1493,
@@ -37062,7 +37062,7 @@
         "rural_teacher": 662
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1341,
         "urban_staff": 565,
@@ -37164,7 +37164,7 @@
         "rural_teacher": 105
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1493,
         "urban_staff": 1493,
@@ -37517,7 +37517,7 @@
         "rural_teacher": 206
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 480,
         "urban_staff": 0,
@@ -37619,7 +37619,7 @@
         "rural_teacher": 69
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 137,
         "urban_staff": 0,
@@ -37972,7 +37972,7 @@
         "rural_teacher": 243
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 537,
         "urban_staff": 0,
@@ -38074,7 +38074,7 @@
         "rural_teacher": 81
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 230,
         "urban_staff": 0,
@@ -38427,7 +38427,7 @@
         "rural_teacher": 355
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 680,
         "urban_staff": 0,
@@ -38529,7 +38529,7 @@
         "rural_teacher": 70
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 217,
         "urban_staff": 0,
@@ -38882,7 +38882,7 @@
         "rural_teacher": 389
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 718,
         "urban_staff": 0,
@@ -38984,7 +38984,7 @@
         "rural_teacher": 110
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 281,
         "urban_staff": 0,
@@ -39337,7 +39337,7 @@
         "rural_teacher": 450
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 582,
         "urban_staff": 0,
@@ -39439,7 +39439,7 @@
         "rural_teacher": 142
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 600,
         "urban_staff": 0,
@@ -39792,7 +39792,7 @@
         "rural_teacher": 134
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 228,
         "urban_staff": 0,
@@ -39894,7 +39894,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 141,
         "urban_staff": 0,
@@ -40247,7 +40247,7 @@
         "rural_teacher": 492
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 687,
         "urban_staff": 0,
@@ -40349,7 +40349,7 @@
         "rural_teacher": 173
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 194,
         "urban_staff": 0,
@@ -40702,7 +40702,7 @@
         "rural_teacher": 394
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 721,
         "urban_staff": 0,
@@ -40804,7 +40804,7 @@
         "rural_teacher": 108
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 418,
         "urban_staff": 0,
@@ -41157,7 +41157,7 @@
         "rural_teacher": 906
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1099,
         "urban_staff": 0,
@@ -41259,7 +41259,7 @@
         "rural_teacher": 97
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 495,
         "urban_staff": 0,
@@ -41612,7 +41612,7 @@
         "rural_teacher": 11056
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 11900,
         "urban_staff": 1800,
@@ -41714,7 +41714,7 @@
         "rural_teacher": 3564
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 6676,
         "urban_staff": 2588,
@@ -42067,7 +42067,7 @@
         "rural_teacher": 579
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1043,
         "urban_staff": 475,
@@ -42169,7 +42169,7 @@
         "rural_teacher": 115
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 696,
         "urban_staff": 477,
@@ -42522,7 +42522,7 @@
         "rural_teacher": 504
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 818,
         "urban_staff": 362,
@@ -42624,7 +42624,7 @@
         "rural_teacher": 215
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 556,
         "urban_staff": 556,
@@ -42977,7 +42977,7 @@
         "rural_teacher": 648
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1059,
         "urban_staff": 563,
@@ -43079,7 +43079,7 @@
         "rural_teacher": 71
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 601,
         "urban_staff": 601,
@@ -43432,7 +43432,7 @@
         "rural_teacher": 983
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1059,
         "urban_staff": 400,
@@ -43534,7 +43534,7 @@
         "rural_teacher": 35
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1288,
         "urban_staff": 954,
@@ -43887,7 +43887,7 @@
         "rural_teacher": 488
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 464,
         "urban_staff": 0,
@@ -43989,7 +43989,7 @@
         "rural_teacher": 115
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 137,
         "urban_staff": 0,
@@ -44342,7 +44342,7 @@
         "rural_teacher": 1075
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1333,
         "urban_staff": 0,
@@ -44444,7 +44444,7 @@
         "rural_teacher": 294
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1295,
         "urban_staff": 0,
@@ -44797,7 +44797,7 @@
         "rural_teacher": 594
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 695,
         "urban_staff": 0,
@@ -44899,7 +44899,7 @@
         "rural_teacher": 62
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 583,
         "urban_staff": 0,
@@ -45252,7 +45252,7 @@
         "rural_teacher": 1306
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1328,
         "urban_staff": 0,
@@ -45354,7 +45354,7 @@
         "rural_teacher": 331
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 570,
         "urban_staff": 0,
@@ -45707,7 +45707,7 @@
         "rural_teacher": 1432
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 907,
         "urban_staff": 0,
@@ -45809,7 +45809,7 @@
         "rural_teacher": 881
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 286,
         "urban_staff": 0,
@@ -46162,7 +46162,7 @@
         "rural_teacher": 1329
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 922,
         "urban_staff": 0,
@@ -46264,7 +46264,7 @@
         "rural_teacher": 480
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 138,
         "urban_staff": 0,
@@ -46617,7 +46617,7 @@
         "rural_teacher": 1100
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1077,
         "urban_staff": 0,
@@ -46719,7 +46719,7 @@
         "rural_teacher": 521
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 253,
         "urban_staff": 0,
@@ -47072,7 +47072,7 @@
         "rural_teacher": 659
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 716,
         "urban_staff": 0,
@@ -47174,7 +47174,7 @@
         "rural_teacher": 224
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 194,
         "urban_staff": 0,
@@ -47527,7 +47527,7 @@
         "rural_teacher": 359
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 479,
         "urban_staff": 0,
@@ -47629,7 +47629,7 @@
         "rural_teacher": 220
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 79,
         "urban_staff": 0,
@@ -47982,7 +47982,7 @@
         "rural_teacher": 12261
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 10362,
         "urban_staff": 731,
@@ -48084,7 +48084,7 @@
         "rural_teacher": 4951
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 4958,
         "urban_staff": 870,
@@ -48437,7 +48437,7 @@
         "rural_teacher": 853
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1631,
         "urban_staff": 731,
@@ -48539,7 +48539,7 @@
         "rural_teacher": 295
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 870,
         "urban_staff": 870,
@@ -48892,7 +48892,7 @@
         "rural_teacher": 1498
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1358,
         "urban_staff": 0,
@@ -48994,7 +48994,7 @@
         "rural_teacher": 593
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 589,
         "urban_staff": 0,
@@ -49347,7 +49347,7 @@
         "rural_teacher": 963
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 808,
         "urban_staff": 0,
@@ -49449,7 +49449,7 @@
         "rural_teacher": 349
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 361,
         "urban_staff": 0,
@@ -49802,7 +49802,7 @@
         "rural_teacher": 1368
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 686,
         "urban_staff": 0,
@@ -49904,7 +49904,7 @@
         "rural_teacher": 462
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 456,
         "urban_staff": 0,
@@ -50257,7 +50257,7 @@
         "rural_teacher": 1070
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1129,
         "urban_staff": 0,
@@ -50359,7 +50359,7 @@
         "rural_teacher": 241
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 334,
         "urban_staff": 0,
@@ -50712,7 +50712,7 @@
         "rural_teacher": 1887
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1415,
         "urban_staff": 0,
@@ -50814,7 +50814,7 @@
         "rural_teacher": 927
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 816,
         "urban_staff": 0,
@@ -51167,7 +51167,7 @@
         "rural_teacher": 3041
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 2313,
         "urban_staff": 0,
@@ -51269,7 +51269,7 @@
         "rural_teacher": 1420
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 910,
         "urban_staff": 0,
@@ -51622,7 +51622,7 @@
         "rural_teacher": 1581
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1022,
         "urban_staff": 0,
@@ -51724,7 +51724,7 @@
         "rural_teacher": 664
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 622,
         "urban_staff": 0,
@@ -52077,7 +52077,7 @@
         "rural_teacher": 1925
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1944,
         "urban_staff": 119,
@@ -52179,7 +52179,7 @@
         "rural_teacher": 636
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 2152,
         "urban_staff": 1103,
@@ -52532,7 +52532,7 @@
         "rural_teacher": 722
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 720,
         "urban_staff": 119,
@@ -52634,7 +52634,7 @@
         "rural_teacher": 329
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1405,
         "urban_staff": 1103,
@@ -52987,7 +52987,7 @@
         "rural_teacher": 668
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 634,
         "urban_staff": 0,
@@ -53089,7 +53089,7 @@
         "rural_teacher": 154
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 312,
         "urban_staff": 0,
@@ -53442,7 +53442,7 @@
         "rural_teacher": 535
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 590,
         "urban_staff": 0,
@@ -53544,7 +53544,7 @@
         "rural_teacher": 153
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 435,
         "urban_staff": 0,
@@ -53897,7 +53897,7 @@
         "rural_teacher": 7481
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 9523,
         "urban_staff": 582,
@@ -53999,7 +53999,7 @@
         "rural_teacher": 2606
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 5011,
         "urban_staff": 990,
@@ -54352,7 +54352,7 @@
         "rural_teacher": 762
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1520,
         "urban_staff": 582,
@@ -54454,7 +54454,7 @@
         "rural_teacher": 280
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1438,
         "urban_staff": 990,
@@ -54807,7 +54807,7 @@
         "rural_teacher": 361
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 222,
         "urban_staff": 0,
@@ -54909,7 +54909,7 @@
         "rural_teacher": 123
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 101,
         "urban_staff": 0,
@@ -55262,7 +55262,7 @@
         "rural_teacher": 589
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1172,
         "urban_staff": 0,
@@ -55364,7 +55364,7 @@
         "rural_teacher": 223
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 851,
         "urban_staff": 0,
@@ -55717,7 +55717,7 @@
         "rural_teacher": 922
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1036,
         "urban_staff": 0,
@@ -55819,7 +55819,7 @@
         "rural_teacher": 395
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 382,
         "urban_staff": 0,
@@ -56172,7 +56172,7 @@
         "rural_teacher": 540
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 908,
         "urban_staff": 0,
@@ -56274,7 +56274,7 @@
         "rural_teacher": 79
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 272,
         "urban_staff": 0,
@@ -56627,7 +56627,7 @@
         "rural_teacher": 402
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 708,
         "urban_staff": 0,
@@ -56729,7 +56729,7 @@
         "rural_teacher": 110
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 256,
         "urban_staff": 0,
@@ -57082,7 +57082,7 @@
         "rural_teacher": 655
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 869,
         "urban_staff": 0,
@@ -57184,7 +57184,7 @@
         "rural_teacher": 406
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 292,
         "urban_staff": 0,
@@ -57537,7 +57537,7 @@
         "rural_teacher": 664
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 501,
         "urban_staff": 0,
@@ -57639,7 +57639,7 @@
         "rural_teacher": 192
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 258,
         "urban_staff": 0,
@@ -57992,7 +57992,7 @@
         "rural_teacher": 705
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 706,
         "urban_staff": 0,
@@ -58094,7 +58094,7 @@
         "rural_teacher": 255
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 255,
         "urban_staff": 0,
@@ -58447,7 +58447,7 @@
         "rural_teacher": 724
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 650,
         "urban_staff": 0,
@@ -58549,7 +58549,7 @@
         "rural_teacher": 271
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 279,
         "urban_staff": 0,
@@ -58902,7 +58902,7 @@
         "rural_teacher": 514
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 526,
         "urban_staff": 0,
@@ -59004,7 +59004,7 @@
         "rural_teacher": 172
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 283,
         "urban_staff": 0,
@@ -59357,7 +59357,7 @@
         "rural_teacher": 643
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 705,
         "urban_staff": 0,
@@ -59459,7 +59459,7 @@
         "rural_teacher": 100
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 344,
         "urban_staff": 0,
@@ -59812,7 +59812,7 @@
         "rural_teacher": 3124
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 4085,
         "urban_staff": 945,
@@ -59914,7 +59914,7 @@
         "rural_teacher": 1039
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1487,
         "urban_staff": 756,
@@ -60267,7 +60267,7 @@
         "rural_teacher": 242
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 522,
         "urban_staff": 340,
@@ -60369,7 +60369,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 253,
         "urban_staff": 187,
@@ -60722,7 +60722,7 @@
         "rural_teacher": 1025
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1348,
         "urban_staff": 605,
@@ -60824,7 +60824,7 @@
         "rural_teacher": 416
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 569,
         "urban_staff": 569,
@@ -61177,7 +61177,7 @@
         "rural_teacher": 468
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 535,
         "urban_staff": 0,
@@ -61279,7 +61279,7 @@
         "rural_teacher": 131
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 161,
         "urban_staff": 0,
@@ -61632,7 +61632,7 @@
         "rural_teacher": 853
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1064,
         "urban_staff": 0,
@@ -61734,7 +61734,7 @@
         "rural_teacher": 397
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 293,
         "urban_staff": 0,
@@ -62087,7 +62087,7 @@
         "rural_teacher": 536
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 616,
         "urban_staff": 0,
@@ -62189,7 +62189,7 @@
         "rural_teacher": 95
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 211,
         "urban_staff": 0,
@@ -62542,7 +62542,7 @@
         "rural_teacher": 1753
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1339,
         "urban_staff": 0,
@@ -62644,7 +62644,7 @@
         "rural_teacher": 625
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 1225,
         "urban_staff": 0,
@@ -62997,7 +62997,7 @@
         "rural_teacher": 395
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 429,
         "urban_staff": 0,
@@ -63099,7 +63099,7 @@
         "rural_teacher": 69
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 502,
         "urban_staff": 0,
@@ -63452,7 +63452,7 @@
         "rural_teacher": 626
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 209,
         "urban_staff": 0,
@@ -63554,7 +63554,7 @@
         "rural_teacher": 206
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 166,
         "urban_staff": 0,
@@ -63907,7 +63907,7 @@
         "rural_teacher": 169
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 193,
         "urban_staff": 0,
@@ -64009,7 +64009,7 @@
         "rural_teacher": 93
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 130,
         "urban_staff": 0,
@@ -64362,7 +64362,7 @@
         "rural_teacher": 563
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 508,
         "urban_staff": 0,
@@ -64464,7 +64464,7 @@
         "rural_teacher": 257
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 427,
         "urban_staff": 0,
@@ -64817,7 +64817,7 @@
         "rural_teacher": 1259
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 1108,
         "urban_staff": 0,
@@ -64919,7 +64919,7 @@
         "rural_teacher": 253
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 706,
         "urban_staff": 0,
@@ -65272,7 +65272,7 @@
         "rural_teacher": 445
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 518,
         "urban_staff": 0,
@@ -65374,7 +65374,7 @@
         "rural_teacher": 90
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 706,
         "urban_staff": 0,
@@ -65727,7 +65727,7 @@
         "rural_teacher": 225
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 211,
         "urban_staff": 0,
@@ -65829,7 +65829,7 @@
         "rural_teacher": 0
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 0,
         "urban_staff": 0,
@@ -66182,7 +66182,7 @@
         "rural_teacher": 589
       }
     },
-    "junior_high_teachers": {
+    "junior_teachers": {
       "2015": {
         "total_staff": 379,
         "urban_staff": 0,
@@ -66284,7 +66284,7 @@
         "rural_teacher": 163
       }
     },
-    "senior_high_teachers": {
+    "senior_teachers": {
       "2015": {
         "total_staff": 0,
         "urban_staff": 0,
diff --git a/Tools/T7_TeacherCount.py b/Tools/T7_TeacherCount.py
index 8e12c46..4ae027b 100644
--- a/Tools/T7_TeacherCount.py
+++ b/Tools/T7_TeacherCount.py
@@ -53,7 +53,7 @@ EDUCATION_STAGES = {
             {'year': 2024, 'total_staff': 'EZ', 'urban_staff': 'FA', 'town_staff': 'FB', 'rural_staff': 'FC', 'total_teacher': 'FD', 'urban_teacher': 'FE', 'town_teacher': 'FF', 'rural_teacher': 'FG'}
         ]
     },
-    'junior_high_teachers': {
+    'junior_teachers': {
         'years': [2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024],
         'columns': [
             {'year': 2015, 'total_staff': 'FH', 'urban_staff': 'FI', 'town_staff': 'FJ', 'rural_staff': 'FK', 'total_teacher': 'FL', 'urban_teacher': 'FM', 'town_teacher': 'FN', 'rural_teacher': 'FO'},
@@ -68,7 +68,7 @@ EDUCATION_STAGES = {
             {'year': 2024, 'total_staff': 'IB', 'urban_staff': 'IC', 'town_staff': 'ID', 'rural_staff': 'IE', 'total_teacher': 'IF', 'urban_teacher': 'IG', 'town_teacher': 'IH', 'rural_teacher': 'II'}
         ]
     },
-    'senior_high_teachers': {
+    'senior_teachers': {
         'years': [2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024],
         'columns': [
             {'year': 2015, 'total_staff': 'IJ', 'urban_staff': 'IK', 'town_staff': 'IL', 'rural_staff': 'IM', 'total_teacher': 'IN', 'urban_teacher': 'IO', 'town_teacher': 'IP', 'rural_teacher': 'IQ'},