Merge "[Tree-Wide] Reference ports by name not index"