FIX picnic_site in all inc/name_*