diff --git a/src/main/java/com/kosherjava/zmanim/hebrewcalendar/Daf.kt b/src/main/java/com/kosherjava/zmanim/hebrewcalendar/Daf.kt
index e0d9b341..fdc69cc4 100644
--- a/src/main/java/com/kosherjava/zmanim/hebrewcalendar/Daf.kt
+++ b/src/main/java/com/kosherjava/zmanim/hebrewcalendar/Daf.kt
@@ -113,22 +113,77 @@ data class Daf(
     val yerushalmiMasechta: String
         get() = yerushalmiMasechtos[masechtaNumber]
 
+
+
     companion object {
-        /**
-         * See [.getMasechtaTransliterated] and [.setMasechtaTransliterated].
-         */
-        private var masechtosBavliTransliterated: Array<String> = arrayOf(
-            "Berachos", "Shabbos", "Eruvin", "Pesachim", "Shekalim",
-            "Yoma", "Sukkah", "Beitzah", "Rosh Hashana", "Taanis", "Megillah", "Moed Katan", "Chagigah", "Yevamos",
-            "Kesubos", "Nedarim", "Nazir", "Sotah", "Gitin", "Kiddushin", "Bava Kamma", "Bava Metzia", "Bava Basra",
-            "Sanhedrin", "Makkos", "Shevuos", "Avodah Zarah", "Horiyos", "Zevachim", "Menachos", "Chullin", "Bechoros",
-            "Arachin", "Temurah", "Kerisos", "Meilah", "Kinnim", "Tamid", "Midos", "Niddah"
+        //Bavli:
+
+        var BRACHOS = "Berachos"
+        var SHABBOS = "Shabbos"
+        var ERUVIN = "Eruvin"
+        var PESACHIM = "Pesachim"
+        var SHEKALIM = "Shekalim"
+        var YOMA = "Yoma"
+        var SUKKAH = "Sukkah"
+        var BEITZAH = "Beitzah"
+        var ROSH_HASHANA = "Rosh Hashana"
+        var TAANIS = "Ta'anis"
+        var MEGILLAH = "Megillah"
+        var MOED_KATAN = "Moed Katan"
+        var CHAGIGAH = "Chagigah"
+        var KESUBOS = "Kesubos"
+        var KIDDUSHIN = "Kiddushin"
+        var BAVA_KAMMA = "Bava Kamma"
+        var MAKKOS = "Makkos"
+        var HORIYOS = "Horiyos"
+        var ZEVACHIM = "Zevachim"
+        var MENACHOS = "Menachos"
+        var CHULLIN = "Chullin"
+        var BECHOROS = "Bechoros"
+        var ARACHIN = "Arachin"
+        var TEMURAH = "Temurah"
+        var KERISOS = "Kerisos"
+        var MEILAH = "Meilah"
+        var KINNIM = "Kinnim"
+        var TAMID = "Tamid"
+        var MIDOS = "Midos"
+        var NIDDAH = "Niddah"
+        var YEVAMOS = "Yevamos"
+        var NEDARIM = "Nedarim"
+        var NAZIR = "Nazir"
+        var SOTAH = "Sotah"
+        var GITIN = "Gitin"
+        var BAVA_METZIA = "Bava Metzia"
+        var BAVA_BASRA = "Bava Basra"
+        var SANHEDRIN = "Sanhedrin"
+        var SHAVUOS = "Shevuos"
+        var AVODAH_ZARA = "Avodah Zarah"
+
+        //Yerushalmi specific:
+
+        var PEAH = "Pe'ah"
+        var DEMAI = "Demai"
+        var KILAYIM = "Kilayim"
+        var SHEVIIS = "Shevi'is"
+        var TERUMOS = "Terumos"
+        var MAASROS = "Ma'asros"
+        var MAASER_SHENI = "Ma'aser Sheni"
+        var CHALAH = "Chalah"
+        var ORLAH = "Orlah"
+        var BIKURIM = "Bikurim"
+
+        var masechtosBavliTransliterated: Array<String> = arrayOf(
+            BRACHOS, SHABBOS, ERUVIN, PESACHIM, SHEKALIM,
+            YOMA, SUKKAH, BEITZAH, ROSH_HASHANA, TAANIS, MEGILLAH, MOED_KATAN, CHAGIGAH, YEVAMOS,
+            KESUBOS, NEDARIM, NAZIR, SOTAH, GITIN, KIDDUSHIN, BAVA_KAMMA, BAVA_METZIA, BAVA_BASRA,
+            SANHEDRIN, MAKKOS, SHAVUOS, AVODAH_ZARA, HORIYOS, ZEVACHIM, MENACHOS, CHULLIN, BECHOROS,
+            ARACHIN, TEMURAH, KERISOS, MEILAH, KINNIM, TAMID, MIDOS, NIDDAH
         )
 
         /**
-         * See [.getMasechta].
+         * See [masechta].
          */
-        private val masechtosBavli: Array<String> = arrayOf(
+        val masechtosBavli: Array<String> = arrayOf(
             "\u05D1\u05E8\u05DB\u05D5\u05EA", "\u05E9\u05D1\u05EA",
             "\u05E2\u05D9\u05E8\u05D5\u05D1\u05D9\u05DF", "\u05E4\u05E1\u05D7\u05D9\u05DD",
             "\u05E9\u05E7\u05DC\u05D9\u05DD", "\u05D9\u05D5\u05DE\u05D0", "\u05E1\u05D5\u05DB\u05D4",
@@ -157,11 +212,11 @@ data class Daf(
          * See [.getYerushalmiMasechtaTransliterated].
          */
         var yerushalmiMasechtosTransliterated: Array<String> = arrayOf(
-            "Berachos", "Pe'ah", "Demai", "Kilayim", "Shevi'is",
-            "Terumos", "Ma'asros", "Ma'aser Sheni", "Chalah", "Orlah", "Bikurim", "Shabbos", "Eruvin", "Pesachim",
-            "Beitzah", "Rosh Hashanah", "Yoma", "Sukah", "Ta'anis", "Shekalim", "Megilah", "Chagigah", "Moed Katan",
-            "Yevamos", "Kesuvos", "Sotah", "Nedarim", "Nazir", "Gitin", "Kidushin", "Bava Kama", "Bava Metzia",
-            "Bava Basra", "Shevuos", "Makos", "Sanhedrin", "Avodah Zarah", "Horayos", "Nidah", "No Daf Today"
+            BRACHOS, PEAH, DEMAI, KILAYIM, SHEVIIS,
+            TERUMOS, MAASROS, MAASER_SHENI, CHALAH, ORLAH, BIKURIM, SHABBOS, ERUVIN, PESACHIM,
+            BEITZAH, ROSH_HASHANA, YOMA, SUKKAH, TAANIS, SHEKALIM, MEGILLAH, CHAGIGAH, MOED_KATAN,
+            YEVAMOS, KESUBOS, SOTAH, NEDARIM, NAZIR, GITIN, KIDDUSHIN, BAVA_KAMMA, BAVA_METZIA,
+            BAVA_BASRA, SHAVUOS, MAKKOS, SANHEDRIN, AVODAH_ZARA, HORIYOS, NIDDAH, "No Daf Today"
         )
         /**
          * Getter method to allow retrieving the list of Yerushalmi *masechtos*.