Correctly manage port names