And fix various bogus bindings following previous PRs.
A few extra renames for classes which were missed in last week's PRs.