Change port names to use consistent naming.
Update names and conflicts.