better remote gateway name matching for flips.