Accounted for different definition of name in Domeo legacy code