FORM_INCORPOREAL

Replaced Intangible with Incorporeal
FORM_GIANT

FORM_AMPHIBIAN replaced with FORM_GIANT