[FIX] Don't shorten gateway names, only addresses