Rename/reorganize primary nav links