Updated the way of getting computer name