bug #1911: Better disk name fetching