Bug 2032: rename FIGHT back to COMBAT