diff --git a/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt b/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
index 741d66d2632..189621f3752 100644
--- a/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
+++ b/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
@@ -1,7 +1,7 @@
 Name:Aboshan, Cephalid Emperor
 ManaCost:4 U U
-Types:Legendary Creature Cephalid Noble
+Types:Legendary Creature Octopus Noble
 PT:3/3
-A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
+A:AB$ Tap | Cost$ tapXType<1/Octopus> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
 A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
-Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
+Oracle:Tap an untapped Octopus you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
diff --git a/forge-gui/res/cardsfolder/b/backstreet_bruiser.txt b/forge-gui/res/cardsfolder/b/backstreet_bruiser.txt
index 48ad9d2d244..23004c8335b 100644
--- a/forge-gui/res/cardsfolder/b/backstreet_bruiser.txt
+++ b/forge-gui/res/cardsfolder/b/backstreet_bruiser.txt
@@ -1,6 +1,6 @@
 Name:Backstreet Bruiser
 ManaCost:1 U
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:3/3
 K:Defender
 S:Mode$ CanAttackDefender | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE2 | Description$ As long as there are two or more counters among creatures you control, CARDNAME can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/c/callous_oppressor.txt b/forge-gui/res/cardsfolder/c/callous_oppressor.txt
index 778b1afb56e..1be9c8da168 100644
--- a/forge-gui/res/cardsfolder/c/callous_oppressor.txt
+++ b/forge-gui/res/cardsfolder/c/callous_oppressor.txt
@@ -1,6 +1,6 @@
 Name:Callous Oppressor
 ManaCost:1 U U
-Types:Creature Cephalid
+Types:Creature Octopus
 PT:1/2
 K:You may choose not to untap CARDNAME during your untap step.
 K:ETBReplacement:Other:DBChooseOpp
diff --git a/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt b/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
index 021386a83d8..aa4538ff24c 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Aristocrat
 ManaCost:4 U
-Types:Creature Cephalid Noble
+Types:Creature Octopus Noble
 PT:3/3
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, mill two cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
diff --git a/forge-gui/res/cardsfolder/c/cephalid_broker.txt b/forge-gui/res/cardsfolder/c/cephalid_broker.txt
index b2901947d6c..14aa7b0b6ac 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_broker.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_broker.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Broker
 ManaCost:3 U
-Types:Creature Cephalid
+Types:Creature Octopus
 PT:2/2
 A:AB$ Draw | Cost$ T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards, then discards two cards. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 2 | Mode$ TgtChoose
diff --git a/forge-gui/res/cardsfolder/c/cephalid_constable.txt b/forge-gui/res/cardsfolder/c/cephalid_constable.txt
index a30b3b9646e..babb660ff2f 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_constable.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_constable.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Constable
 ManaCost:1 U U
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:1/1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigBounce | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, return up to that many target permanents that player controls to their owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Permanent.ControlledBy TriggeredTarget | TgtPrompt$ Select target permanent | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Hand
diff --git a/forge-gui/res/cardsfolder/c/cephalid_facetaker.txt b/forge-gui/res/cardsfolder/c/cephalid_facetaker.txt
index b84f262a2c3..e9290510f4f 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_facetaker.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_facetaker.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Facetaker
 ManaCost:2 U
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:1/4
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigClone | TriggerDescription$ At the beginning of combat on your turn, you may have CARDNAME become a copy of another target creature until end of turn, except it's 1/4 and has "This creature can't be blocked."
diff --git a/forge-gui/res/cardsfolder/c/cephalid_illusionist.txt b/forge-gui/res/cardsfolder/c/cephalid_illusionist.txt
index 1caf5b41778..b7812b0d2f7 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_illusionist.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_illusionist.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Illusionist
 ManaCost:1 U
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:1/1
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, mill three cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You
diff --git a/forge-gui/res/cardsfolder/c/cephalid_inkshrouder.txt b/forge-gui/res/cardsfolder/c/cephalid_inkshrouder.txt
index c47088e3877..9549fe44f53 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_inkshrouder.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_inkshrouder.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Inkshrouder
 ManaCost:2 U
-Types:Creature Cephalid
+Types:Creature Octopus
 PT:2/1
 A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Shroud | SubAbility$ DBUnblockable | StackDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. | SpellDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. (A creature with shroud can't be the target of spells or abilities.)
 SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
diff --git a/forge-gui/res/cardsfolder/c/cephalid_looter.txt b/forge-gui/res/cardsfolder/c/cephalid_looter.txt
index 6b1d9c15014..172987c904c 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_looter.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_looter.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Looter
 ManaCost:2 U
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:2/1
 A:AB$ Draw | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws a card, then discards a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 1 | Mode$ TgtChoose
diff --git a/forge-gui/res/cardsfolder/c/cephalid_pathmage.txt b/forge-gui/res/cardsfolder/c/cephalid_pathmage.txt
index c558bbc4613..71745c7c636 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_pathmage.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_pathmage.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Pathmage
 ManaCost:2 U
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:1/2
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 A:AB$ Effect | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | RememberObjects$ Targeted | StaticAbilities$ STUnblockable | SpellDescription$ Target creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/c/cephalid_retainer.txt b/forge-gui/res/cardsfolder/c/cephalid_retainer.txt
index a2150e92914..0bcf1771457 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_retainer.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_retainer.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Retainer
 ManaCost:2 U U
-Types:Creature Cephalid
+Types:Creature Octopus
 PT:2/3
 A:AB$ Tap | Cost$ U U | ValidTgts$ Creature.withoutFlying | TgtPrompt$ Select target creature without flying | SpellDescription$ Tap target creature without flying.
 Oracle:{U}{U}: Tap target creature without flying.
diff --git a/forge-gui/res/cardsfolder/c/cephalid_sage.txt b/forge-gui/res/cardsfolder/c/cephalid_sage.txt
index a895c228d7b..50d3e79f88c 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_sage.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_sage.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Sage
 ManaCost:3 U
-Types:Creature Cephalid
+Types:Creature Octopus
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | Threshold$ True | TriggerDescription$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters the battlefield, draw three cards, then discard two cards."
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3 | SubAbility$ DBDiscard
diff --git a/forge-gui/res/cardsfolder/c/cephalid_scout.txt b/forge-gui/res/cardsfolder/c/cephalid_scout.txt
index ce57ddf22c9..3daf7262b8e 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_scout.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_scout.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Scout
 ManaCost:1 U
-Types:Creature Cephalid Wizard Scout
+Types:Creature Octopus Wizard Scout
 PT:1/1
 K:Flying
 A:AB$ Draw | Cost$ 2 U Sac<1/Land> | NumCards$ 1 | SpellDescription$ Draw a card.
diff --git a/forge-gui/res/cardsfolder/c/cephalid_snitch.txt b/forge-gui/res/cardsfolder/c/cephalid_snitch.txt
index aad3212d654..15286baf685 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_snitch.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_snitch.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Snitch
 ManaCost:1 U
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:1/1
 A:AB$ Debuff | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Protection from black | SpellDescription$ Target creature loses protection from black until end of turn.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/c/cephalid_vandal.txt b/forge-gui/res/cardsfolder/c/cephalid_vandal.txt
index 59875db965e..6956224f519 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_vandal.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_vandal.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Vandal
 ManaCost:1 U
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:1/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a shred counter on CARDNAME. Then mill a card for each shred counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SHRED | CounterNum$ 1 | SubAbility$ DBMill
diff --git a/forge-gui/res/cardsfolder/d/diviner_of_fates.txt b/forge-gui/res/cardsfolder/d/diviner_of_fates.txt
index e923d4009b5..44e5f721369 100644
--- a/forge-gui/res/cardsfolder/d/diviner_of_fates.txt
+++ b/forge-gui/res/cardsfolder/d/diviner_of_fates.txt
@@ -1,6 +1,6 @@
 Name:Diviner of Fates
 ManaCost:W U B
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
 SVar:TrigConnive:DB$ Connive
diff --git a/forge-gui/res/cardsfolder/f/freejam_regent.txt b/forge-gui/res/cardsfolder/f/freejam_regent.txt
index 3759beb8d42..6a2f1d5f859 100644
--- a/forge-gui/res/cardsfolder/f/freejam_regent.txt
+++ b/forge-gui/res/cardsfolder/f/freejam_regent.txt
@@ -1,6 +1,6 @@
 Name:Freejam Regent
 ManaCost:4 R R
-Types:Creature Dragon
+Types:Creature Cat Dragon
 PT:4/4
 K:Improvise
 K:Flying
diff --git a/forge-gui/res/cardsfolder/k/kamiz_obscura_oculus.txt b/forge-gui/res/cardsfolder/k/kamiz_obscura_oculus.txt
index bb399deb4ec..1460c3f4d3f 100644
--- a/forge-gui/res/cardsfolder/k/kamiz_obscura_oculus.txt
+++ b/forge-gui/res/cardsfolder/k/kamiz_obscura_oculus.txt
@@ -1,6 +1,6 @@
 Name:Kamiz, Obscura Oculus
 ManaCost:1 W U B
-Types:Legendary Creature Cephalid Rogue
+Types:Legendary Creature Octopus Rogue
 PT:2/4
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking creature can't be blocked this turn. It connives. Then choose another attacking creature with lesser power. That creature gains double strike until end of turn. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
 SVar:TrigPump:DB$ Effect | RememberObjects$ Targeted | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | StaticAbilities$ Unblockable | SubAbility$ DBConnive
diff --git a/forge-gui/res/cardsfolder/k/khod_etlan_shiis_envoy.txt b/forge-gui/res/cardsfolder/k/khod_etlan_shiis_envoy.txt
index 819bd07b73b..8d86efb7f1a 100644
--- a/forge-gui/res/cardsfolder/k/khod_etlan_shiis_envoy.txt
+++ b/forge-gui/res/cardsfolder/k/khod_etlan_shiis_envoy.txt
@@ -3,5 +3,5 @@ ManaCost:2 U
 Types:Legendary Creature Homarid Warrior
 PT:2/3
 S:Mode$ Continuous | Affected$ Land | AddType$ Island | Description$ All lands are Islands in addition to their other types.
-S:Mode$ Continuous | Affected$ Homarid.Other+YouCtrl,Camarid.Other+YouCtrl,Cephalid.Other+YouCtrl,Nautilid.Other+YouCtrl,Merfolk.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Homarids, Camarids, Cephalids, Nautilids, and Merfolk you control get +1/+1.
-Oracle:All lands are Islands in addition to their other types.\nOther Homarids, Camarids, Cephalids, Nautilids, and Merfolk you control get +1/+1.
+S:Mode$ Continuous | Affected$ Homarid.Other+YouCtrl,Camarid.Other+YouCtrl,Octopus.Other+YouCtrl,Nautilid.Other+YouCtrl,Merfolk.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Homarids, Camarids, Octopuses, Nautilids, and Merfolk you control get +1/+1.
+Oracle:All lands are Islands in addition to their other types.\nOther Homarids, Camarids, Octopuses, Nautilids, and Merfolk you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt b/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
index b0614f43ab8..e1b88309eeb 100644
--- a/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
+++ b/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
@@ -1,6 +1,6 @@
 Name:Llawan, Cephalid Empress
 ManaCost:3 U
-Types:Legendary Creature Cephalid Noble
+Types:Legendary Creature Octopus Noble
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return all blue creatures your opponents control to their owners' hands.
 SVar:TrigChange:DB$ ChangeZoneAll | ChangeType$ Creature.Blue+OppCtrl | Origin$ Battlefield | Destination$ Hand
diff --git a/forge-gui/res/cardsfolder/o/obscura_interceptor.txt b/forge-gui/res/cardsfolder/o/obscura_interceptor.txt
index 0d0d562f9ef..ffa8c4aa2b3 100644
--- a/forge-gui/res/cardsfolder/o/obscura_interceptor.txt
+++ b/forge-gui/res/cardsfolder/o/obscura_interceptor.txt
@@ -1,6 +1,6 @@
 Name:Obscura Interceptor
 ManaCost:1 W U B
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:3/1
 K:Flash
 K:Lifelink
diff --git a/forge-gui/res/cardsfolder/o/obscura_polymorphist.txt b/forge-gui/res/cardsfolder/o/obscura_polymorphist.txt
index 1d3a31c6aa5..deb77a9d57c 100644
--- a/forge-gui/res/cardsfolder/o/obscura_polymorphist.txt
+++ b/forge-gui/res/cardsfolder/o/obscura_polymorphist.txt
@@ -1,6 +1,6 @@
 Name:Obscura Polymorphist
 ManaCost:1 W U
-Types:Creature Cephalid Wizard
+Types:Creature Octopus Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target creature. Its controller seeks a creature card.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBSeek
diff --git a/forge-gui/res/cardsfolder/o/omen_hawker.txt b/forge-gui/res/cardsfolder/o/omen_hawker.txt
index 6279eba2de7..f6d110f1454 100644
--- a/forge-gui/res/cardsfolder/o/omen_hawker.txt
+++ b/forge-gui/res/cardsfolder/o/omen_hawker.txt
@@ -1,6 +1,6 @@
 Name:Omen Hawker
 ManaCost:U
-Types:Creature Cephalid Advisor
+Types:Creature Octopus Advisor
 PT:1/1
 A:AB$ Mana | Cost$ T | Produced$ C U | RestrictValid$ Activated | SpellDescription$ Add {C}{U}. Spend this mana only to activate abilities.
 Oracle:{T}: Add {C}{U}. Spend this mana only to activate abilities.
diff --git a/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt b/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
index 32472a1546c..75b4ef3054f 100644
--- a/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
@@ -1,6 +1,6 @@
 Name:Psychic Pickpocket
 ManaCost:4 U
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. When it connives this way, return up to one target nonland permanent to its owner's hand. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
 SVar:TrigConnive:DB$ Connive | SubAbility$ DBImmediateTrigger
diff --git a/forge-gui/res/cardsfolder/q/queza_augur_of_agonies.txt b/forge-gui/res/cardsfolder/q/queza_augur_of_agonies.txt
index 102d586df34..05fbfdba40f 100644
--- a/forge-gui/res/cardsfolder/q/queza_augur_of_agonies.txt
+++ b/forge-gui/res/cardsfolder/q/queza_augur_of_agonies.txt
@@ -1,6 +1,6 @@
 Name:Queza, Augur of Agonies
 ManaCost:1 W U B
-Types:Legendary Creature Cephalid Advisor
+Types:Legendary Creature Octopus Advisor
 PT:3/4
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you draw a card, target opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
diff --git a/forge-gui/res/cardsfolder/r/revel_ruiner.txt b/forge-gui/res/cardsfolder/r/revel_ruiner.txt
index 4c89c7c5abd..2d781fe447f 100644
--- a/forge-gui/res/cardsfolder/r/revel_ruiner.txt
+++ b/forge-gui/res/cardsfolder/r/revel_ruiner.txt
@@ -1,6 +1,6 @@
 Name:Revel Ruiner
 ManaCost:3 B
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:3/1
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-queza_augur_of_agonies.txt b/forge-gui/res/cardsfolder/rebalanced/a-queza_augur_of_agonies.txt
index 8ecab109130..76bcf3dbb45 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-queza_augur_of_agonies.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-queza_augur_of_agonies.txt
@@ -1,6 +1,6 @@
 Name:A-Queza, Augur of Agonies
 ManaCost:1 W U B
-Types:Legendary Creature Cephalid Advisor
+Types:Legendary Creature Octopus Advisor
 PT:3/4
 K:Vigilance
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you draw a card, target opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-revel_ruiner.txt b/forge-gui/res/cardsfolder/rebalanced/a-revel_ruiner.txt
index fbf67633d80..942d38a05ba 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-revel_ruiner.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-revel_ruiner.txt
@@ -1,6 +1,6 @@
 Name:A-Revel Ruiner
 ManaCost:3 B
-Types:Creature Cephalid Rogue
+Types:Creature Octopus Rogue
 PT:3/2
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives.
diff --git a/forge-gui/res/cardsfolder/s/shield_broker.txt b/forge-gui/res/cardsfolder/s/shield_broker.txt
index 54d1a4dbebb..4084231b9bd 100644
--- a/forge-gui/res/cardsfolder/s/shield_broker.txt
+++ b/forge-gui/res/cardsfolder/s/shield_broker.txt
@@ -1,6 +1,6 @@
 Name:Shield Broker
 ManaCost:3 U U
-Types:Creature Cephalid Advisor
+Types:Creature Octopus Advisor
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a shield counter on target noncommander creature you don't control. You gain control of that creature for as long as it has a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.IsNotCommander+YouDontCtrl | TgtPrompt$ Select target noncommander creature you don't control | CounterType$ SHIELD | SubAbility$ DBEffect
diff --git a/forge-gui/res/cardsfolder/s/skyship_stalker.txt b/forge-gui/res/cardsfolder/s/skyship_stalker.txt
index 1e1721c3668..3f465f41aee 100644
--- a/forge-gui/res/cardsfolder/s/skyship_stalker.txt
+++ b/forge-gui/res/cardsfolder/s/skyship_stalker.txt
@@ -1,6 +1,6 @@
 Name:Skyship Stalker
 ManaCost:2 R R
-Types:Creature Dragon
+Types:Creature Cat Dragon
 PT:3/3
 K:Flying
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 734efdc3642..eefdccc6fdf 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -59,7 +59,6 @@ Caribou:Caribous
 Carrier:Carriers
 Cat:Cats
 Centaur:Centaurs
-Cephalid:Cephalids
 Chimera:Chimeras
 Citizen:Citizens
 Clamfolk:Clamfolk