rewrite address naming