Rename "vampiricism" to "vampirism" (ChrisOelmueller, #8435)

Chris Oelmueller made an excellent patch for this, but unfortunately it
was rather rotted by the time somebody decided to look at it. It was
easier to recreate than update. I've also added some tiles stuff which
was missed in the original patch.

24 files changed, 53 insertions, 53 deletions

diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index ffa5de3ab5..0b0e2f881f 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -233,7 +233,7 @@ PLUS:    +4
 COLOUR:  ETC_BONE
 TILE:    spwpn_vampires_tooth
 TILE_EQ: vampires_tooth
-BRAND:   SPWPN_VAMPIRICISM
+BRAND:   SPWPN_VAMPIRISM
 VALUE:   1000
 BOOL:    special
 
@@ -354,7 +354,7 @@ PLUS:    +8
 COLOUR:  ETC_DARK
 TILE:    urand_leech
 TILE_EQ: leech
-BRAND:   SPWPN_VAMPIRICISM
+BRAND:   SPWPN_VAMPIRISM
 EV:      -2
 STR:     -2
 INT:     -2
@@ -1168,7 +1168,7 @@ TILE:    spwpn_majin
 TILE_EQ: majin
 MP:      6
 INT:     6
-BRAND:   SPWPN_VAMPIRICISM
+BRAND:   SPWPN_VAMPIRISM
 BOOL:    unholy
 
 # This is the first of two amulets used to test suppression aura.
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 2e3cf8235f..b3ac6ccb8f 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -129,7 +129,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
     else if (is_good_god(which_god)
              && (brand == SPWPN_DRAINING
                  || brand == SPWPN_PAIN
-                 || brand == SPWPN_VAMPIRICISM
+                 || brand == SPWPN_VAMPIRISM
                  || brand == SPWPN_REAPING
                  || brand == SPWPN_CHAOS
                  || is_demonic(item)
@@ -748,7 +748,7 @@ static void _get_randart_properties(const item_def &item,
                 SPWPN_FLAMING,
                 SPWPN_FREEZING,
                 SPWPN_ELECTROCUTION,
-                SPWPN_VAMPIRICISM,
+                SPWPN_VAMPIRISM,
                 SPWPN_PAIN,
                 SPWPN_VENOM,
                 -1);
@@ -767,7 +767,7 @@ static void _get_randart_properties(const item_def &item,
                 13, SPWPN_HOLY_WRATH,
                 13, SPWPN_ELECTROCUTION,
                 13, SPWPN_SPEED,
-                13, SPWPN_VAMPIRICISM,
+                13, SPWPN_VAMPIRISM,
                 13, SPWPN_PAIN,
                 13, SPWPN_ANTIMAGIC,
                  3, SPWPN_DISTORTION,
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc
index a0d88c2856..33f2d09f48 100644
--- a/crawl-ref/source/attack.cc
+++ b/crawl-ref/source/attack.cc
@@ -903,7 +903,7 @@ brand_type attack::random_chaos_brand()
                     10, SPWPN_VENOM,
                     10, SPWPN_CHAOS,
                      5, SPWPN_DRAINING,
-                     5, SPWPN_VAMPIRICISM,
+                     5, SPWPN_VAMPIRISM,
                      5, SPWPN_HOLY_WRATH,
                      5, SPWPN_ANTIMAGIC,
                      2, SPWPN_CONFUSE,
@@ -928,7 +928,7 @@ brand_type attack::random_chaos_brand()
             if (defender->holiness() == MH_UNDEAD)
                 susceptible = false;
             break;
-        case SPWPN_VAMPIRICISM:
+        case SPWPN_VAMPIRISM:
             if (defender->is_summoned())
             {
                 susceptible = false;
@@ -979,7 +979,7 @@ brand_type attack::random_chaos_brand()
     case SPWPN_VENOM:           brand_name += "venom"; break;
     case SPWPN_DRAINING:        brand_name += "draining"; break;
     case SPWPN_DISTORTION:      brand_name += "distortion"; break;
-    case SPWPN_VAMPIRICISM:     brand_name += "vampiricism"; break;
+    case SPWPN_VAMPIRISM:     brand_name += "vampirism"; break;
     case SPWPN_VORPAL:          brand_name += "vorpal"; break;
     case SPWPN_ANTIMAGIC:       brand_name += "antimagic"; break;
 
@@ -1640,7 +1640,7 @@ bool attack::apply_damage_brand(const char *what)
     brand = damage_brand == SPWPN_CHAOS ? random_chaos_brand() : damage_brand;
 
     if (brand != SPWPN_FLAMING && brand != SPWPN_FREEZING
-        && brand != SPWPN_ELECTROCUTION && brand != SPWPN_VAMPIRICISM
+        && brand != SPWPN_ELECTROCUTION && brand != SPWPN_VAMPIRISM
         && !defender->alive())
     {
         // Most brands have no extra effects on just killed enemies, and the
@@ -1651,7 +1651,7 @@ bool attack::apply_damage_brand(const char *what)
     if (!damage_done
         && (brand == SPWPN_FLAMING || brand == SPWPN_FREEZING
             || brand == SPWPN_HOLY_WRATH || brand == SPWPN_DRAGON_SLAYING
-            || brand == SPWPN_VORPAL || brand == SPWPN_VAMPIRICISM
+            || brand == SPWPN_VORPAL || brand == SPWPN_VAMPIRISM
             || brand == SPWPN_ANTIMAGIC))
     {
         // These brands require some regular damage to function.
@@ -1756,7 +1756,7 @@ bool attack::apply_damage_brand(const char *what)
         // Note: Leaving special_damage_message empty because there isn't one.
         break;
 
-    case SPWPN_VAMPIRICISM:
+    case SPWPN_VAMPIRISM:
     {
         if (x_chance_in_y(defender->res_negative_energy(), 3))
             break;
diff --git a/crawl-ref/source/dat/des/branches/blade.des b/crawl-ref/source/dat/des/branches/blade.des
index c04329d824..2e37182a71 100644
--- a/crawl-ref/source/dat/des/branches/blade.des
+++ b/crawl-ref/source/dat/des/branches/blade.des
@@ -16,7 +16,7 @@ function hall_of_blades_weapon(e)
                  "executioner's axe", "eveningstar", "bardiche",
                  "lajatang"}
   local egos = {"flaming", "freezing", "electrocution", "venom",
-              "holy_wrath", "pain", "vampiricism", "draining",
+              "holy_wrath", "pain", "vampirism", "draining",
               "antimagic", "distortion"}
   local weapon1 = util.random_from(types)
   local weapon2 = weapon1
diff --git a/crawl-ref/source/dat/des/branches/crypt.des b/crawl-ref/source/dat/des/branches/crypt.des
index e0d3b91212..1f66e1da22 100644
--- a/crawl-ref/source/dat/des/branches/crypt.des
+++ b/crawl-ref/source/dat/des/branches/crypt.des
@@ -68,7 +68,7 @@ function crypt_loot_plus(e)
   -- provide some unreliable but high quality incentives.
   local drain = "ego:draining good_item ident:type"
   local pain = "ego:pain ident:type"
-  local vamp = "ego:vampiricism ident:type"
+  local vamp = "ego:vampirism ident:type"
   local book = "randbook disc:necromancy numspells:6 spells:"
   local ring = "ring of positive energy randart good_item"
   local amulet = "amulet of warding randart good_item"
@@ -1132,7 +1132,7 @@ MONS:   w:20 skeletal warrior / w:50 skeleton / nothing
 KMONS:  1 = vampire knight / Jory w:5, vampire knight
 KMONS:  2 = phantasmal warrior
 KMONS:  3 = vampire knight w:15 / \
-            dancing weapon ; long sword ego:vampiricism ident:type
+            dancing weapon ; long sword ego:vampirism ident:type
 KMONS:  4 = vampire mage
 KMONS:  5 = skeletal warrior / phantasmal warrior
 KMONS:  6 = vampire w:15 / jiangshi
@@ -1703,7 +1703,7 @@ MONS:   generate_awake bone dragon / generate_awake curse toe
 MONS:   patrolling vampire ; scimitar | great sword | battleaxe | \
         war axe | broad axe . chain mail w:15 | plate armour w:1
 KMONS:  2 = vampire knight / Jory w:15, vampire knight
-KMONS:  3 = dancing weapon ; long sword ego:vampiricism / vampire knight w:1 / \
+KMONS:  3 = dancing weapon ; long sword ego:vampirism / vampire knight w:1 / \
             vampire ; scimitar | great sword | battleaxe | \
             war axe | broad axe . chain mail w:15 | plate armour w:1
 KMONS:  4 = phantasmal warrior / jiangshi
diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des
index 1e593749da..9f9d8eea5c 100644
--- a/crawl-ref/source/dat/des/builder/shops.des
+++ b/crawl-ref/source/dat/des/builder/shops.des
@@ -339,7 +339,7 @@ KMONS:   1 = vampire / bat
 KMONS:   2 = vampire / vampire mage / vampire knight
 KFEAT:   v = general shop type:Blood suffix:Bar count:7 ; \
          w:60 potion of blood | w:20 potion of coagulated blood | \
-         w:10 any weapon ego:vampiricism | w:9 randbook disc:necromancy | w:1 book of annihilations
+         w:10 any weapon ego:vampirism | w:9 randbook disc:necromancy | w:1 book of annihilations
 SUBST:   ? = 2.Y
 : if you.branch() == "D" then
 SUBST:   2 = 1
@@ -388,7 +388,7 @@ SUBST: G : YlG
 :   "type:Sacrilege suffix:Store", "type:Wicked suffix:Wares"})
 : kfeat("s = general shop " .. shopname .. " ; \
 :   potion of blood | any weapon ego:draining w:15 | any weapon ego:pain w:5 | \
-:   any weapon ego:vampiricism w:5 | demon blade w:5 | \
+:   any weapon ego:vampirism w:5 | demon blade w:5 | \
 :   demon whip w:5 | demon trident w:5 | wand of draining | scroll of torment | \
 :   staff of death | \
 :   lantern of shadows w:5 | book of necromancy | book of death | \
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index ec1912ef7a..2ad120e0b6 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -906,7 +906,7 @@ NAME: sprint_mu_vaults_butterflies
 TAGS: sprint_mu_vaults no_rotate no_hmirror no_vmirror
 MONS: centaur warrior, lich, shadow dragon, ogre mage
 MONS: vault guard ; short sword ego:electrocution | long sword ego:flaming |\
-      dire flail ego:vampiricism | war axe ego:freezing | spear ego:vorpal |\
+      dire flail ego:vampirism | war axe ego:freezing | spear ego:vorpal |\
       great mace ego:pain | great sword ego:venom .\
       chain mail ego:poison_resistance | chain mail ego:cold_resistance |\
       scale mail ego:poison_resistance | scale mail ego:cold_resistance |\
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index be727fc2e3..5f3eb1aaf3 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -957,7 +957,7 @@ static string _describe_weapon(const item_def &item, bool verbose)
                     "different, random effect.";
             }
             break;
-        case SPWPN_VAMPIRICISM:
+        case SPWPN_VAMPIRISM:
             description += "It inflicts no extra harm, but heals its "
                 "wielder somewhat when it strikes a living foe.";
             break;
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 41811cd858..ed3df3f28c 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -207,7 +207,7 @@ bool is_evil_item(const item_def& item)
         const int item_brand = get_weapon_brand(item);
         return item_brand == SPWPN_DRAINING
                || item_brand == SPWPN_PAIN
-               || item_brand == SPWPN_VAMPIRICISM
+               || item_brand == SPWPN_VAMPIRISM
                || item_brand == SPWPN_REAPING;
         }
         break;
diff --git a/crawl-ref/source/godpassive.cc b/crawl-ref/source/godpassive.cc
index 71ac2c7b34..1d38029c61 100644
--- a/crawl-ref/source/godpassive.cc
+++ b/crawl-ref/source/godpassive.cc
@@ -423,7 +423,7 @@ bool god_id_item(item_def& item, bool silent)
         // gives more information than absolutely needed.
         brand_type brand = get_weapon_brand(item);
         if (brand == SPWPN_DRAINING || brand == SPWPN_PAIN
-            || brand == SPWPN_VAMPIRICISM || brand == SPWPN_REAPING)
+            || brand == SPWPN_VAMPIRISM || brand == SPWPN_REAPING)
         {
             ided |= ISFLAG_KNOW_TYPE;
         }
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index ca5f88a018..1f1966704c 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1742,7 +1742,7 @@ bool needs_handle_warning(const item_def &item, operation_types oper)
             return true;
         }
 
-        if (get_weapon_brand(item) == SPWPN_VAMPIRICISM
+        if (get_weapon_brand(item) == SPWPN_VAMPIRISM
             && !you.is_undead && !crawl_state.game_is_zotdef()
             && !you_foodless())
         {
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index e9dfe26b58..fcc5f344ec 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -182,7 +182,7 @@ bool can_wield(item_def *weapon, bool say_reason,
     }
     else if (!ignore_temporary_disability
              && you.hunger_state < HS_FULL
-             && get_weapon_brand(*weapon) == SPWPN_VAMPIRICISM
+             && get_weapon_brand(*weapon) == SPWPN_VAMPIRISM
              && !crawl_state.game_is_zotdef()
              && !you.is_undead
              && !you_foodless()
@@ -2115,7 +2115,7 @@ static bool _god_hates_brand(const int brand)
 {
     if (is_good_god(you.religion)
         && (brand == SPWPN_DRAINING
-            || brand == SPWPN_VAMPIRICISM
+            || brand == SPWPN_VAMPIRISM
             || brand == SPWPN_CHAOS))
     {
         return true;
@@ -2170,7 +2170,7 @@ static void _rebrand_weapon(item_def& wpn)
                                     15, SPWPN_VORPAL,
                                     15, SPWPN_ELECTROCUTION,
                                     12, SPWPN_PROTECTION,
-                                    8, SPWPN_VAMPIRICISM,
+                                    8, SPWPN_VAMPIRISM,
                                     3, SPWPN_CHAOS,
                                     0);
         }
@@ -2210,7 +2210,7 @@ static void _brand_weapon(item_def &wpn)
         break;
 
     case SPWPN_DRAINING:
-    case SPWPN_VAMPIRICISM:
+    case SPWPN_VAMPIRISM:
         flash_colour = DARKGREY;
         mprf("%s thirsts for the lives of mortals!", itname.c_str());
         break;
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index a756edc948..e4817fcfca 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -462,7 +462,7 @@ const char* weapon_brand_name(const item_def& item, bool terse, int override_bra
     case SPWPN_DISTORTION: return terse ? "distort" : "distortion";
     case SPWPN_REAPING: return terse ? "reap" : "reaping";
 
-    case SPWPN_VAMPIRICISM:
+    case SPWPN_VAMPIRISM:
         return terse ? "vamp" : ""; // non-terse already handled
 
     case SPWPN_VORPAL:
@@ -1229,8 +1229,8 @@ string ego_type_string(const item_def &item, bool terse, int override_brand)
                                             : get_weapon_brand(item);
             // this is specialcased out of weapon_brand_name
             // ("vampiric hand axe", etc)
-            if (checkbrand == SPWPN_VAMPIRICISM)
-                return "vampiricism";
+            if (checkbrand == SPWPN_VAMPIRISM)
+                return "vampirism";
             else if (checkbrand == SPWPN_ANTIMAGIC)
                 return "antimagic";
         }
@@ -1361,7 +1361,7 @@ string item_def::name_aux(description_level_type desc, bool terse, bool ident,
         if (know_brand && !terse)
         {
             int brand = get_weapon_brand(*this);
-            if (brand == SPWPN_VAMPIRICISM)
+            if (brand == SPWPN_VAMPIRISM)
                 buff << "vampiric ";
             else if (brand == SPWPN_ANTIMAGIC)
                 buff << "antimagic ";
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 46fefd0f4b..abe12848d1 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -94,7 +94,7 @@ enum brand_type // item_def.special
     SPWPN_FLAME,   // ranged, only
     SPWPN_FROST,   // ranged, only
 #endif
-    SPWPN_VAMPIRICISM,
+    SPWPN_VAMPIRISM,
     SPWPN_PAIN,
     SPWPN_ANTIMAGIC,
     SPWPN_DISTORTION,
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index bd822a8538..95a17f7e79 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -888,7 +888,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = coinflip() ? SPWPN_FLAMING : SPWPN_FREEZING;
 
             if (one_chance_in(20))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
             // **** intentional fall through here ****
         case WPN_MACE:
         case WPN_GREAT_MACE:
@@ -934,7 +934,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_DISTORTION;
 
             if (one_chance_in(10))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(8))
                 rc = SPWPN_ELECTROCUTION;
@@ -974,7 +974,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_ANTIMAGIC;
 
             if (one_chance_in(10))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(25))
                 rc = SPWPN_DISTORTION;
@@ -1016,7 +1016,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_PAIN;
 
             if (one_chance_in(10))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(25))
                 rc = SPWPN_DISTORTION;
@@ -1048,7 +1048,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_DISTORTION;
 
             if (one_chance_in(10))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(8))
                 rc = SPWPN_DRAINING;
@@ -1082,7 +1082,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_PAIN;
 
             if (one_chance_in(10))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(25))
                 rc = SPWPN_DISTORTION;
@@ -1159,7 +1159,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
             else if (one_chance_in(6))
                 rc = SPWPN_ELECTROCUTION;
             else if (one_chance_in(5))
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
             else if (one_chance_in(6))
                 rc = SPWPN_VENOM;
             else if (one_chance_in(8))
@@ -1173,7 +1173,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
                 rc = SPWPN_ANTIMAGIC;
 
             if (one_chance_in(5))       // 7.3%
-                rc = SPWPN_VAMPIRICISM;
+                rc = SPWPN_VAMPIRISM;
 
             if (one_chance_in(10))      // 4.0%
                 rc = SPWPN_PAIN;
@@ -1265,7 +1265,7 @@ bool is_weapon_brand_ok(int type, int brand, bool strict)
     // Melee-only brands.
     case SPWPN_DRAGON_SLAYING:
     case SPWPN_DRAINING:
-    case SPWPN_VAMPIRICISM:
+    case SPWPN_VAMPIRISM:
     case SPWPN_PAIN:
     case SPWPN_DISTORTION:
     case SPWPN_ANTIMAGIC:
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 0f0fc883c1..dc005b1bc2 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4785,7 +4785,7 @@ static int _str_to_ego(item_spec &spec, string ego_str)
         "vorpal",
         "flame",
         "frost",
-        "vampiricism",
+        "vampirism",
         "pain",
         "antimagic",
         "distortion",
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index b3dfa46741..03bf8d27f0 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -1103,7 +1103,7 @@ void melee_attack::player_aux_setup(unarmed_attack_type atk)
                 || you.hunger_state < HS_SATIATED && coinflip()
                 || you.hunger_state >= HS_SATIATED && one_chance_in(4)))
         {
-            damage_brand = SPWPN_VAMPIRICISM;
+            damage_brand = SPWPN_VAMPIRISM;
         }
 
         if (player_mutation_level(MUT_ANTIMAGIC_BITE))
@@ -1250,7 +1250,7 @@ bool melee_attack::player_aux_unarmed()
             continue;
 
         to_hit = random2(calc_your_to_hit_unarmed(atk,
-                         damage_brand == SPWPN_VAMPIRICISM));
+                         damage_brand == SPWPN_VAMPIRISM));
 
         handle_noise(defender->pos());
         alert_nearby_monsters();
@@ -1363,7 +1363,7 @@ bool melee_attack::player_aux_apply(unarmed_attack_type atk)
 
 
         // Normal vampiric biting attack, not if already got stabbing special.
-        if (damage_brand == SPWPN_VAMPIRICISM && you.species == SP_VAMPIRE
+        if (damage_brand == SPWPN_VAMPIRISM && you.species == SP_VAMPIRE
             && (!stab_attempt || stab_bonus <= 0))
         {
             _player_vampire_draws_blood(defender->as_monster(), damage_done);
@@ -1878,7 +1878,7 @@ bool melee_attack::player_monattk_hit_effects()
         // No further effects.
     }
     else if (you.species == SP_VAMPIRE
-             && damage_brand == SPWPN_VAMPIRICISM
+             && damage_brand == SPWPN_VAMPIRISM
              && you.weapon()
              && _player_vampire_draws_blood(defender->as_monster(),
                                             damage_done, false, 5))
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index 864cfab139..8d9941c353 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -265,7 +265,7 @@ brand_type player::damage_brand(int)
 
         case TRAN_BAT:
             if (species == SP_VAMPIRE && one_chance_in(8))
-                ret = SPWPN_VAMPIRICISM;
+                ret = SPWPN_VAMPIRISM;
             break;
 
         default:
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index d92c70cdc9..f4685bd3eb 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -548,7 +548,7 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs, bool unmeld)
                          you.hand_name(true).c_str());
                     break;
 
-                case SPWPN_VAMPIRICISM:
+                case SPWPN_VAMPIRISM:
                     if (you.species == SP_VAMPIRE)
                     {
                         mpr("You feel a bloodthirsty glee!");
@@ -707,7 +707,7 @@ static void _unequip_weapon_effect(item_def& item, bool showMsgs, bool meld)
                 you.redraw_evasion = true;
                 break;
 
-            case SPWPN_VAMPIRICISM:
+            case SPWPN_VAMPIRISM:
                 if (showMsgs)
                 {
                     if (you.species == SP_VAMPIRE)
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index b21eda2c6c..ca7ce19f57 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -192,7 +192,7 @@ i-speed BRAND_SPEED
 i-vorpal BRAND_VORPAL
 i-flaming BRAND_FLAME
 i-freezing BRAND_FROST
-i-vampiricism BRAND_VAMPIRICISM
+i-vampirism BRAND_VAMPIRISM
 i-pain BRAND_PAIN
 %rim 1
 i-antimagic BRAND_ANTIMAGIC
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-vampiricism.png b/crawl-ref/source/rltiles/item/weapon/brands/i-vampirism.png
index 82c7a5a445..82c7a5a445 100644
--- a/crawl-ref/source/rltiles/item/weapon/brands/i-vampiricism.png
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-vampirism.png
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 6c65d7086d..319052f65f 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1066,7 +1066,7 @@ unsigned int item_value(item_def item, bool ident)
                 break;
 
             case SPWPN_SPEED:
-            case SPWPN_VAMPIRICISM:
+            case SPWPN_VAMPIRISM:
                 valued *= 30;
                 break;
 
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index c2b9eba8df..78e041b4b0 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -1139,7 +1139,7 @@ static void _debug_acquirement_stats(FILE *ostat)
             "vorpal",
             "flame",
             "frost",
-            "vampiricism",
+            "vampirism",
             "pain",
             "antimagic",
             "distortion",
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index e1f9049691..c1368922ea 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1414,7 +1414,7 @@ static int _xom_swap_weapons(bool debug = false)
             && !(weapon.flags & ISFLAG_SUMMONED)
             && you.can_wield(weapon, true) && mi->can_wield(*wpn, true)
             && get_weapon_brand(weapon) != SPWPN_DISTORTION
-            && (get_weapon_brand(weapon) != SPWPN_VAMPIRICISM
+            && (get_weapon_brand(weapon) != SPWPN_VAMPIRISM
                 || you.is_undead || you.hunger_state >= HS_FULL)
             && (!is_artefact(weapon) || _art_is_safe(weapon)))
         {