6 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 53440c7e27..e81fe3deb0 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1469,7 +1469,7 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_TSO_SUMMON_DIVINE_WARRIOR:
         if (coinflip())
-            summon_guardian(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);
+            summon_angel(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);
         else
             summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);
         exercise(SK_INVOCATIONS, 8 + random2(10));
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index c8a8c8bae0..7543b418c9 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2600,7 +2600,7 @@ enum spell_type
     SPELL_REPEL_MISSILES,
     SPELL_BERSERKER_RAGE,
     SPELL_DISPEL_UNDEAD,               //   85
-    SPELL_SUMMON_GUARDIAN,
+    SPELL_SUMMON_ANGEL,
     SPELL_PESTILENCE,
     SPELL_THUNDERBOLT,
     SPELL_FLAME_OF_CLEANSING,
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index a59028742a..9ddb65b0cc 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1641,7 +1641,7 @@ static bool _summon_holy_being_wrapper(int pow, god_type god,
 }
 
 // TSO sends an angel for a follower.
-bool summon_guardian(int pow, god_type god, bool quiet)
+bool summon_angel(int pow, god_type god, bool quiet)
 {
     return _summon_holy_being_wrapper(pow, god, MONS_ANGEL, quiet);
 }
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 2469e5e0ef..66b4300281 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -64,7 +64,7 @@ bool cast_summon_ugly_thing(int pow, god_type god = GOD_NO_GOD);
 bool cast_summon_dragon(int pow, god_type god = GOD_NO_GOD);
 bool summon_berserker(int pow, god_type god = GOD_NO_GOD,
                       bool force_hostile = false);
-bool summon_guardian(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
+bool summon_angel(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
 bool summon_daeva(int pow, god_type god = GOD_NO_GOD, bool quiet = false);
 
 bool cast_tukimas_dance(int pow, god_type god = GOD_NO_GOD,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index f1f1e4e410..d00bbb4241 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1509,8 +1509,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
         cast_summon_dragon(powc, god);
         break;
 
-    case SPELL_SUMMON_GUARDIAN:
-        summon_guardian(powc, god);
+    case SPELL_SUMMON_ANGEL:
+        summon_angel(powc, god);
         break;
 
     case SPELL_SUMMON_DAEVA:
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 7c6c1a678d..f301af2a9b 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1165,7 +1165,7 @@
 },
 
 {
-    SPELL_SUMMON_GUARDIAN, "Summon Guardian",
+    SPELL_SUMMON_ANGEL, "Summon Angel",
      SPTYP_HOLY,
      SPFLAG_NONE,
      7,