Separating name-based and structural distance calculations.