Bug 2032: Rename FIGHT -> COMBAT, again