Renamed database links to be more informative + fixed labels of those links