VOYEUR: Further renaming of state Id, and merging of flag bytes