Catch up Machines -> Hosts rename done in SC

Resolves #107