R600: Update for name changes from r175667.