Rename resource and meta fields for CAP 66

For easier integration, I am holding off on renaming fields for CAP 66 so that we can change both `curr` and `next` at the same time. Once we are ready to prepare `curr` for the p23 release, we should rename these fields in both branches.