use system name instead of name as names overlap..