Adapt to upstream renames