#125 cleanup
- Renamed state JSON attributes to follow guidelines