snapshotgroup -> snapshot_group
a bunch of renames; added a few TODO