Renamed Claim to Faction, code cleanup