Revert back to name-based lookups for Factions