Initial hacky work on pulling out object field values.
Rename some updater/object identifiers.