Changed logic of updating machine name.