port and names fixes