finish multiple system name support