Re-name links to numbered elements

I tried it originally without them, but there were times it looked very awkward/out of place.