weaved: Split command and state property name into a trait and a name
am: c984451a70

* commit 'c984451a701ab88a14ff5d911939e686f09d16a8':
  weaved: Split command and state property name into a trait and a name