Fix distinct stops with same shortnames