New links and names.
Merge branch 'develop' into staging