fixes #3674 - Host --> System - change everything

DO NOT MERGE.