Merge "Fix: Fix machine name"