aggregate and "state" naming clarifications