Misc renames for consistency, added one more place to set info ports to -1