Fix cases where one name is within another