fix address naming