FIX: issue with names with common prefix;