Compilation fixes and twaks for name conventions of architecture ports