Similar nit as before with `entries` getting renamed to `contents` even though members are still called `entry`... if there were a lot of this change maybe it's not worth trying to fix right now...