Add custom link names (Closes #72)

Not so sure if these are the only affected places. I'll add tests if needed :)