Another variable rename for clarify.
WIP: Make collection and mapping over collections work at same time, progress on testing.
Rebase into model changes.