Rename Chronos to Cheibriados. (Jude Brown)

21 files changed, 89 insertions, 89 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 7711fecc65..7ffdccc328 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -147,9 +147,9 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
     // Feawn
     { ABIL_FEAWN_SUNLIGHT, ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_RAIN,
       ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION },
-    // Chronos
-    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_CHRONOS_TIME_BEND,
-      ABIL_CHRONOS_SLOUCH, ABIL_CHRONOS_TIME_STEP },
+    // Cheibriados
+    { ABIL_NON_ABILITY, ABIL_NON_ABILITY, ABIL_CHEIBRIADOS_TIME_BEND,
+      ABIL_CHEIBRIADOS_SLOUCH, ABIL_CHEIBRIADOS_TIME_STEP },
 };
 
 // The description screen was way out of date with the actual costs.
@@ -337,11 +337,11 @@ static const ability_def Ability_List[] =
     { ABIL_FEAWN_SPAWN_SPORES, "Reproduction", 4, 0, 50, 2, ABFLAG_NONE},
     { ABIL_FEAWN_EVOLUTION, "Evolution", 4, 0, 0, 2, ABFLAG_FRUIT},
 
-    // Chronos
-    { ABIL_CHRONOS_PONDEROUSIFY, "Make Ponderous", 2, 0, 0, 0, ABFLAG_NONE },
-    { ABIL_CHRONOS_TIME_BEND, "Bend Time", 3, 0, 50, 1, ABFLAG_NONE },
-    { ABIL_CHRONOS_SLOUCH, "Ruinous Time", 5, 0, 100, 5, ABFLAG_NONE },
-    { ABIL_CHRONOS_TIME_STEP, "Step From Time", 10, 0, 200, 10, ABFLAG_NONE },
+    // Cheibriados
+    { ABIL_CHEIBRIADOS_PONDEROUSIFY, "Make Ponderous", 2, 0, 0, 0, ABFLAG_NONE },
+    { ABIL_CHEIBRIADOS_TIME_BEND, "Bend Time", 3, 0, 50, 1, ABFLAG_NONE },
+    { ABIL_CHEIBRIADOS_SLOUCH, "Ruinous Time", 5, 0, 100, 5, ABFLAG_NONE },
+    { ABIL_CHEIBRIADOS_TIME_STEP, "Step From Time", 10, 0, 200, 10, ABFLAG_NONE },
 
     { ABIL_HARM_PROTECTION, "Protection From Harm", 0, 0, 0, 0, ABFLAG_NONE },
     { ABIL_HARM_PROTECTION_II, "Reliable Protection From Harm",
@@ -726,7 +726,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
         break;
 
     case ABIL_YRED_ANIMATE_REMAINS:
-    case ABIL_CHRONOS_PONDEROUSIFY:
+    case ABIL_CHEIBRIADOS_PONDEROUSIFY:
         invoc = true;
         failure = 40 - (you.piety / 20) - (3 * you.skills[SK_INVOCATIONS]);
         break;
@@ -754,7 +754,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
         break;
 
     case ABIL_YRED_RECALL_UNDEAD_SLAVES:
-    case ABIL_CHRONOS_TIME_BEND:
+    case ABIL_CHEIBRIADOS_TIME_BEND:
         invoc = true;
         failure = 50 - (you.piety / 20) - (you.skills[SK_INVOCATIONS] * 4);
         break;
@@ -768,7 +768,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_FEAWN_SPAWN_SPORES:
     case ABIL_FEAWN_RAIN:
     case ABIL_YRED_DRAIN_LIFE:
-    case ABIL_CHRONOS_SLOUCH:
+    case ABIL_CHEIBRIADOS_SLOUCH:
         invoc = true;
         failure = 60 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
         break;
@@ -789,7 +789,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
     case ABIL_ELYVILON_DIVINE_VIGOUR:
     case ABIL_LUGONU_ABYSS_ENTER:
     case ABIL_JIYVA_CURE_BAD_MUTATION:
-    case ABIL_CHRONOS_TIME_STEP:
+    case ABIL_CHEIBRIADOS_TIME_STEP:
         invoc = true;
         failure = 80 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
         break;
@@ -2085,28 +2085,28 @@ static bool _do_ability(const ability_def& abil)
         // Activated via prayer elsewhere.
         break;
 
-    case ABIL_CHRONOS_PONDEROUSIFY:
+    case ABIL_CHEIBRIADOS_PONDEROUSIFY:
         if (!ponderousify_armour())
             return (false);
         break;
 
-    case ABIL_CHRONOS_TIME_STEP:
-        chronos_time_step(you.skills[SK_INVOCATIONS]*you.piety/10);
+    case ABIL_CHEIBRIADOS_TIME_STEP:
+        cheibriados_time_step(you.skills[SK_INVOCATIONS]*you.piety/10);
         exercise(SK_INVOCATIONS, 5 + random2(5));
         break;
 
-    case ABIL_CHRONOS_TIME_BEND:
-        chronos_time_bend(16 + you.skills[SK_INVOCATIONS] * 8);
+    case ABIL_CHEIBRIADOS_TIME_BEND:
+        cheibriados_time_bend(16 + you.skills[SK_INVOCATIONS] * 8);
         exercise(SK_INVOCATIONS, 2 + random2(3));
         break;
 
-    case ABIL_CHRONOS_SLOUCH:
+    case ABIL_CHEIBRIADOS_SLOUCH:
         mpr("You can feel time thicken.");
 #ifdef DEBUG_DIAGNOSTICS
         mprf(MSGCH_DIAGNOSTICS, "your speed is %d", player_movement_speed());
 #endif
         exercise(SK_INVOCATIONS, 4 + random2(4));
-        chronos_slouch(0);
+        cheibriados_slouch(0);
         break;
 
 
@@ -2409,8 +2409,8 @@ std::vector<talent> your_talents(bool check_confused)
         _add_talent(talents, ABIL_TROG_BURN_SPELLBOOKS, check_confused);
     else if (you.religion == GOD_FEAWN)
         _add_talent(talents, ABIL_FEAWN_FUNGAL_BLOOM, check_confused);
-    else if (you.religion == GOD_CHRONOS)
-        _add_talent(talents, ABIL_CHRONOS_PONDEROUSIFY, check_confused);
+    else if (you.religion == GOD_CHEIBRIADOS)
+        _add_talent(talents, ABIL_CHEIBRIADOS_PONDEROUSIFY, check_confused);
 
     // Gods take abilities away until penance completed. -- bwr
     // God abilities generally don't work while silenced (they require
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 820bc6662f..f783222c72 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -392,7 +392,7 @@ static void _god_greeting_message(bool game_start)
     case GOD_FEAWN:
         simple_god_message(" says: Spread life and death.");
         break;
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         simple_god_message(" says: Take it easy.");
         break;
 
@@ -3941,7 +3941,7 @@ static void _move_player(coord_def move)
 
     apply_berserk_penalty = !attacking;
 
-    if (!attacking && you.religion == GOD_CHRONOS && one_chance_in(10)
+    if (!attacking && you.religion == GOD_CHEIBRIADOS && one_chance_in(10)
         && player_equip_ego_type(EQ_BOOTS, SPARM_RUNNING))
     {
         did_god_conduct(DID_HASTY, 1, true);
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index c6d7d525b9..588d9b39f8 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -341,22 +341,22 @@ tttt.C.ttttttt
       ttttttt 
 ENDMAP
 
-NAME:   chronos_altar_1
+NAME:   cheibriados_altar_1
 DEPTH:  D:2-7
 PLACE:  D:8
 WEIGHT: 75
-KFEAT:  C = altar_chronos
+KFEAT:  C = altar_cheibriados
 MAP
 ...
 .C.
 ...
 ENDMAP
 
-NAME:    chronos_altar_2
+NAME:    cheibriados_altar_2
 DEPTH:   D:2-7
 PLACE:   D:8
 WEIGHT:  75
-KFEAT:   C = altar_chronos
+KFEAT:   C = altar_cheibriados
 MONS:    giant slug, giant snail, elephant slug
 SUBST:   1 : 1:50 2:30 3:10 4:10
 NSUBST:  4 = 1:1 / 1:2 / 1:3
@@ -372,11 +372,11 @@ MAP
 .......
 ENDMAP
 
-NAME:   chronos_altar_3
+NAME:   cheibriados_altar_3
 DEPTH:  D:2-7
 PLACE:  D:8
 WEIGHT: 75
-KFEAT:  C = altar_chronos
+KFEAT:  C = altar_cheibriados
 ITEM:   potion of slowing
 ITEM:   apple, pear, orange, banana
 SUBST:  e : efgh
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index ffbf0ef909..63dbf33cce 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -385,7 +385,7 @@ Use fruit to turn some plants and fungi in your line of sight into stronger spec
 %%%%
 Make Ponderous
 
-Alter a piece of body armour so it slows the wearer down.  This is generally bad for hasty people, those who appreciate taking the time may benefit from Chronos' favour when they are not so fast.
+Alter a piece of body armour so it slows the wearer down.  This is generally bad for hasty people, those who appreciate taking the time may benefit from Cheibriados's favour when they are not so fast.
 %%%%
 Bend Time
 
diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index 5f4ec87514..2007e7c9f3 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -171,7 +171,7 @@ A slime covered rock wall
 
 This rock wall is thickly coated with bright green slime. Ewwwwww.
 %%%%
-A snail-covered altar of Chronos
+A snail-covered altar of Cheibriados
 
 This altar somehow seems more stationary than the others.
 %%%%
diff --git a/crawl-ref/source/dat/descript/gods.txt b/crawl-ref/source/dat/descript/gods.txt
index b57b4275c6..e90d5a7110 100644
--- a/crawl-ref/source/dat/descript/gods.txt
+++ b/crawl-ref/source/dat/descript/gods.txt
@@ -78,9 +78,9 @@ Feawn
 
 Feawn is the god of plant and fungal life.
 %%%%
-Chronos
+Cheibriados
 
-Chronos is a god who meditates on the mystery of time. Those who choose to follow his path will learn to eschew unnecessary haste, slowing down both themselves and others, and hurt those who refuse to slow down. Especially devout followers may even temporarily abandon the flow of time and its needless disturbations.
+Cheibriados is a god who meditates on the mystery of time. Those who choose to follow his path will learn to eschew unnecessary haste, slowing down both themselves and others, and hurt those who refuse to slow down. Especially devout followers may even temporarily abandon the flow of time and its needless disturbations.
 %%%%
 Zin powers
 
@@ -140,7 +140,7 @@ Feawn powers
 
 Feawn encourages followers to promote the growth of plant life.
 %%%%
-Chronos powers
+Cheibriados powers
 
 Followers are rewarded for moving slowly and killing creatures which are faster than they are.  Moving too quickly or using magically hastened weapons is frowned upon.  He rewards his faithful with a slowed metabolism, the power to slow other creatures, harm those who move more quickly than you do and finally, the ability to step out of the flow of time.
 %%%%
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 93c7428f93..2e6d8273d3 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3298,7 +3298,7 @@ const char *divine_title[NUM_GODS][8] =
     {"Walking Fertiliser", "Green %s",              "Photosynthesist",          "Planter",
      "Nimbus",             "Sporadic Warrior",      "Green Death",              "Force of Nature"},
 
-    // Chronos -- slow theme
+    // Cheibriados -- slow theme
     {"Hurried",            "Slacker",               "Procrastinator",           "Watchdog",
      "Ticktocktomancer",   "Time Lord",             "The End All And Be All",   "Alpha Omega"}
 };
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 17ac92944d..dc49279f14 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2778,8 +2778,8 @@ static std::string _base_feature_desc(dungeon_feature_type grid,
         return ("viscous altar of Jiyva");
     case DNGN_ALTAR_FEAWN:
         return ("blossoming altar of Feawn");
-    case DNGN_ALTAR_CHRONOS:
-        return ("snail-covered altar of Chronos");
+    case DNGN_ALTAR_CHEIBRIADOS:
+        return ("snail-covered altar of Cheibriados");
 
     case DNGN_FOUNTAIN_BLUE:
         return ("fountain of clear blue water");
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index fd5c9b0fc9..65245158fa 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -3620,10 +3620,10 @@ void handle_time(long time_delta)
     }
     else
     {
-        // If Chronos has slowed your biology, disease might
+        // If Cheibriados has slowed your biology, disease might
         // not actually do anything.
         if (one_chance_in(30)
-            && !(you.religion == GOD_CHRONOS
+            && !(you.religion == GOD_CHEIBRIADOS
                  && piety_rank(you.piety) >= 1
                  && coinflip()))
         {
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 819d383ede..8e20a3e7c5 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -110,10 +110,10 @@ enum ability_type
     ABIL_FEAWN_PLANT_RING,
     ABIL_FEAWN_SPAWN_SPORES,
     ABIL_FEAWN_EVOLUTION,
-    ABIL_CHRONOS_PONDEROUSIFY,              // 250
-    ABIL_CHRONOS_TIME_STEP,
-    ABIL_CHRONOS_TIME_BEND,
-    ABIL_CHRONOS_SLOUCH,
+    ABIL_CHEIBRIADOS_PONDEROUSIFY,          // 250
+    ABIL_CHEIBRIADOS_TIME_STEP,
+    ABIL_CHEIBRIADOS_TIME_BEND,
+    ABIL_CHEIBRIADOS_SLOUCH,
 
     ABIL_TRAN_BAT = 260,
     ABIL_HARM_PROTECTION,
@@ -754,7 +754,7 @@ enum conduct_type
     DID_KILL_WIZARD,
     DID_KILL_PRIEST,
     DID_KILL_HOLY,
-    DID_KILL_FAST,                      // Chronos
+    DID_KILL_FAST,                      // Cheibriados
     DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
     DID_LIVING_KILLED_BY_SERVANT,
     DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE,
@@ -783,7 +783,7 @@ enum conduct_type
     DID_KILL_SLIME,                     // Jiyva
     DID_KILL_PLANT,                     // Feawn
     DID_ALLY_KILLED_PLANT,              // Feawn
-    DID_HASTY,                          // Chronos
+    DID_HASTY,                          // Cheibriados
 
     NUM_CONDUCTS
 };
@@ -1158,8 +1158,8 @@ enum dungeon_feature_type
     DNGN_ALTAR_BEOGH,
     DNGN_ALTAR_JIYVA,
     DNGN_ALTAR_FEAWN,
-    DNGN_ALTAR_CHRONOS,
-    DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_CHRONOS,
+    DNGN_ALTAR_CHEIBRIADOS,
+    DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_CHEIBRIADOS,
 
     DNGN_FOUNTAIN_BLUE = 200,          //  200
     DNGN_FOUNTAIN_SPARKLING,           // aka 'Magic Fountain' {dlb}
@@ -1412,7 +1412,7 @@ enum god_type
     GOD_BEOGH,
     GOD_JIYVA,                         //   15
     GOD_FEAWN,
-    GOD_CHRONOS,
+    GOD_CHEIBRIADOS,
     NUM_GODS,                          // always after last god
 
     GOD_RANDOM = 100,
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 32b50f7359..c7cb708858 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -498,7 +498,7 @@ static int _slouch_monsters(coord_def where, int pow, int, actor* agent)
     return (1);
 }
 
-int chronos_slouch(int pow)
+int cheibriados_slouch(int pow)
 {
     return (apply_area_visible(_slouch_monsters, pow));
 }
@@ -562,7 +562,7 @@ void lugonu_bends_space()
 
 ////////////////////////////////////////////////////////////////////////
 
-void chronos_time_bend(int pow)
+void cheibriados_time_bend(int pow)
 {
     mpr("The flow of time bends around you.");
 
@@ -581,13 +581,13 @@ void chronos_time_bend(int pow)
             simple_god_message(
                 make_stringf(" rebukes %s.",
                              mon->name(DESC_NOCAP_THE).c_str()).c_str(),
-                             GOD_CHRONOS);
+                             GOD_CHEIBRIADOS);
             do_slow_monster(mon, KC_YOU);
         }
     }
 }
 
-void chronos_time_step(int pow) // pow is the number of turns to skip
+void cheibriados_time_step(int pow) // pow is the number of turns to skip
 {
     coord_def old_pos = you.pos();
 
diff --git a/crawl-ref/source/godabil.h b/crawl-ref/source/godabil.h
index c588a6f5f5..16a2f8e376 100644
--- a/crawl-ref/source/godabil.h
+++ b/crawl-ref/source/godabil.h
@@ -10,7 +10,6 @@
 #include "externs.h"
 
 bool ponderousify_armour();
-int chronos_slouch(int pow);
 bool zin_sustenance(bool actual = true);
 bool zin_remove_all_mutations();
 bool yred_injury_mirror(bool actual = true);
@@ -30,6 +29,8 @@ bool vehumet_supports_spell(spell_type spell);
 bool trog_burn_spellbooks();
 
 void lugonu_bends_space();
-void chronos_time_bend(int pow);
-void chronos_time_step(int pow);
+
+int cheibriados_slouch(int pow);
+void cheibriados_time_bend(int pow);
+void cheibriados_time_step(int pow);
 #endif
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 7ff8497a30..59f8ffbd78 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -414,7 +414,7 @@ conduct_type god_hates_item_handling(const item_def &item)
         }
         break;
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         if (item_type_known(item) && is_hasty_item(item))
             return (DID_HASTY);
         break;
@@ -460,7 +460,7 @@ bool god_hates_spell_type(spell_type spell, god_type god)
             return (true);
         break;
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         if (is_hasty_spell(spell))
             return (true);
         break;
diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc
index a1115e5628..1a1af10863 100644
--- a/crawl-ref/source/l_dgngrd.cc
+++ b/crawl-ref/source/l_dgngrd.cc
@@ -55,7 +55,7 @@ const char *dngn_feature_names[] =
 "altar_yredelemnul", "altar_xom", "altar_vehumet",
 "altar_okawaru", "altar_makhleb", "altar_sif_muna", "altar_trog",
 "altar_nemelex_xobeh", "altar_elyvilon", "altar_lugonu",
-"altar_beogh", "altar_jiyva", "altar_feawn", "altar_chronos", "", "", "",
+"altar_beogh", "altar_jiyva", "altar_feawn", "altar_cheibriados", "", "", "",
 "fountain_blue", "fountain_sparkling", "fountain_blood",
 "dry_fountain_blue", "dry_fountain_sparkling", "dry_fountain_blood",
 "permadry_fountain", "abandoned_shop"
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 19963af361..72bb7b560d 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -238,7 +238,7 @@ static char god_message_altar_colour( god_type god )
     case GOD_LUGONU:
         return (LIGHTRED);
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         return (LIGHTCYAN);
 
     case GOD_JIYVA:
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 5c0c7000de..ddb5bf7b92 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1542,7 +1542,7 @@ int monster_die(monsters *monster, killer_type killer,
                                     true, monster);
                 }
 
-                // Chronos hates fast monsters
+                // Cheibriados hates fast monsters
                 if (mons_is_fast(monster))
                 {
                     did_god_conduct(DID_KILL_FAST, monster->hit_dice,
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index a63077e149..1796bf9444 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1196,9 +1196,9 @@ int player_hunger_rate(void)
     if (you.duration[DUR_REGENERATION])
         hunger += 4;
 
-    // If Chronos has slowed your life processes, there's a
+    // If Cheibriados has slowed your life processes, there's a
     // chance you'll hunger a bit less.
-    if (GOD_CHRONOS == you.religion
+    if (GOD_CHEIBRIADOS == you.religion
         && piety_rank(you.piety) >= 1
         && coinflip())
         hunger--;
@@ -5448,10 +5448,10 @@ bool poison_player(int amount, bool force)
 
 void dec_poison_player()
 {
-    // If Chronos has slowed your life processes, there's a
+    // If Cheibriados has slowed your life processes, there's a
     // chance that your poison level is simply unaffected and
     // you aren't hurt by poison.
-    if (GOD_CHRONOS == you.religion
+    if (GOD_CHEIBRIADOS == you.religion
         && piety_rank(you.piety) >= 1
         && coinflip())
         return;
@@ -5720,9 +5720,9 @@ void dec_disease_player()
 {
     if (you.disease > 0)
     {
-        // If Chronos has slowed your life processes, there's a
+        // If Cheibriados has slowed your life processes, there's a
         // chance that your disease level is unaffected.
-        if (GOD_CHRONOS == you.religion
+        if (GOD_CHEIBRIADOS == you.religion
             && piety_rank(you.piety) >= 1
             && coinflip())
         {
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index d9150dc922..f85f8140ff 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -297,9 +297,9 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "spawn explosive spores",
       "induce evolution"
     },
-    // Chronos
+    // Cheibriados
     { "",
-      "Chronos is slowing your biology.",
+      "Cheibriados is slowing your biology.",
       "bend time to slow others",
       "inflict damage to those overly hasty",
       "step out of the time flow"
@@ -404,9 +404,9 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
       "spawn explosive spores",
       "induce evolution"
     },
-    // Chronos
+    // Cheibriados
     { "",
-      "Chronos will no longer slow your biology.",
+      "Cheibriados will no longer slow your biology.",
       "bend time to slow others",
       "inflict damage to those overly hasty",
       "step out of the time flow"
@@ -570,7 +570,7 @@ std::string get_god_likes(god_type which_god, bool verbose)
         likes.push_back(info);
         break;
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         snprintf(info, INFO_SIZE, "you kill fast things%s",
                  verbose ? ", relative to your current speed"
                          : "");
@@ -869,7 +869,7 @@ std::string get_god_dislikes(god_type which_god, bool /*verbose*/)
         dislikes.push_back("you kill slimes");
         break;
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         dislikes.push_back("you hasten yourself");
         dislikes.push_back("use unnaturally quick items");
         break;
@@ -2558,8 +2558,8 @@ std::string god_name(god_type which_god, bool long_name)
         return (long_name ? god_name_jiyva(true) + " the Shapeless"
                           : god_name_jiyva(false));
     }
-    case GOD_FEAWN:    return (long_name ? "Feawn the Arboreal" : "Feawn");
-    case GOD_CHRONOS:  return (long_name ? "Chronos the Contemplative" : "Chronos");
+    case GOD_FEAWN:        return (long_name ? "Feawn the Arboreal" : "Feawn");
+    case GOD_CHEIBRIADOS:  return (long_name ? "Cheibriados the Contemplative" : "Cheibriados");
     case GOD_XOM:
         if (!long_name)
             return "Xom";
@@ -3082,7 +3082,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
             break;
 
         case DID_KILL_FAST:
-            if (you.religion == GOD_CHRONOS
+            if (you.religion == GOD_CHEIBRIADOS
                 && !god_hates_attacking_friend(you.religion, victim))
             {
                 simple_god_message(" appreciates the change of pace.");
@@ -3465,7 +3465,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
             break;
 
         case DID_HASTY:
-            if (you.religion == GOD_CHRONOS)
+            if (you.religion == GOD_CHEIBRIADOS)
             {
                 if (!known)
                 {
@@ -4280,10 +4280,10 @@ static bool _elyvilon_retribution()
     return (true);
 }
 
-static bool _chronos_retribution()
+static bool _cheibriados_retribution()
 {
     // time god/slowness theme
-    const god_type god = GOD_CHRONOS;
+    const god_type god = GOD_CHEIBRIADOS;
     simple_god_message(" bends time around you.", god);
     switch (random2(5))
     {
@@ -5069,7 +5069,7 @@ bool divine_retribution(god_type god)
     case GOD_ELYVILON:      do_more = _elyvilon_retribution(); break;
     case GOD_JIYVA:         do_more = _jiyva_retribution(); break;
     case GOD_FEAWN:         do_more = _feawn_retribution(); break;
-    case GOD_CHRONOS:       do_more = _chronos_retribution(); break;
+    case GOD_CHEIBRIADOS:   do_more = _cheibriados_retribution(); break;
 
     default:
 #if DEBUG_DIAGNOSTICS || DEBUG_RELIGION
@@ -6905,9 +6905,9 @@ void god_pitch(god_type which_god)
             MSGCH_GOD);
         mpr("The plants of the dungeon cease their hostilities.", MSGCH_GOD);
     }
-    else if (you.religion == GOD_CHRONOS)
+    else if (you.religion == GOD_CHEIBRIADOS)
     {
-        mpr("You can now call upon Chronos to make your armour ponderous.",
+        mpr("You can now call upon Cheibriados to make your armour ponderous.",
             MSGCH_GOD);
     }
 
@@ -7221,7 +7221,7 @@ void handle_god_time()
                 gain_piety(1);
             return;
 
-        case GOD_CHRONOS:
+        case GOD_CHEIBRIADOS:
         case GOD_SHINING_ONE:
             if (_need_free_piety() && one_chance_in(15))
                 gain_piety(1);
@@ -7330,7 +7330,7 @@ int god_colour(god_type god) // mv - added
     case GOD_JIYVA:
         return (GREEN);
 
-    case GOD_CHRONOS:
+    case GOD_CHEIBRIADOS:
         return (LIGHTCYAN);
 
     case GOD_NO_GOD:
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 1500449ba0..7ce45ea637 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -483,7 +483,7 @@ dngn_altar_jiyva DNGN_ALTAR_JIYVA
 %rim 1
 dngn_altar_feawn DNGN_ALTAR_FEAWN
 %rim 0
-dngn_altar DNGN_ALTAR_CHRONOS
+dngn_altar DNGN_ALTAR_CHEIBRIADOS
 
 %sdir dc-dngn
 dngn_blue_fountain DNGN_BLUE_FOUNTAIN
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 1c8b18a8b2..3b0d459215 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2534,9 +2534,8 @@ int tileidx_feature(int object, int gx, int gy)
         return TILE_DNGN_ALTAR_JIYVA;
     case DNGN_ALTAR_FEAWN:
         return TILE_DNGN_ALTAR_FEAWN;
-    case DNGN_ALTAR_CHRONOS:
-        return TILE_DNGN_ALTAR_CHRONOS;
-
+    case DNGN_ALTAR_CHEIBRIADOS:
+        return TILE_DNGN_ALTAR_CHEIBRIADOS;
     case DNGN_FOUNTAIN_BLUE:
         return TILE_DNGN_BLUE_FOUNTAIN;
     case DNGN_FOUNTAIN_SPARKLING:
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index d680af4e79..361d58bf5a 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1976,7 +1976,7 @@ bool is_feature(int feature, const coord_def& where)
         case DNGN_ALTAR_BEOGH:
         case DNGN_ALTAR_JIYVA:
         case DNGN_ALTAR_FEAWN:
-        case DNGN_ALTAR_CHRONOS:
+        case DNGN_ALTAR_CHEIBRIADOS:
             return (true);
         default:
             return (false);
@@ -3647,7 +3647,7 @@ void init_feature_table( void )
             Feature[i].minimap     = MF_FEATURE;
             break;
 
-        case DNGN_ALTAR_CHRONOS:
+        case DNGN_ALTAR_CHEIBRIADOS:
             Feature[i].colour      = LIGHTCYAN;
             Feature[i].dchar       = DCHAR_ALTAR;
             Feature[i].flags      |= FFT_NOTABLE;