Align version and port types with their signature

Change-Id: Ie241a0c5e9c9cd1dabbacd94188387b656897fbd
cleanup
Revert "cleanup"

This reverts commit 593f74660d759b54e0586ac242a002d1e013b420.
Revert "Revert "cleanup""

This reverts commit 5687ab43010faa5b0116cf9b0b428147e1aad76a.