Merge "Update test names after package changes."