Adapt to the naming changes in the previous commit.