names for supply and return modified since ports are renamed
Merge branch 'Annex60compatible' of https://github.com/GlennReynders/A60-CE
ISSUE: pipes not connected correctly