umonitoring - update to deal with the new logic in machines naming