Fix regressions due to renaming