Fix name from address used in gateway