more port and names fixes