Further dependency name updates after sbesson's review.