Commits: Adapt to recent class renames, fix SHAs