VOYEUR: Renaming to standardize on stateId/stackId variable names