Adapted units names and extended management script