Rename JSON fields to match new pickett
Finish rename of schema
Merge pull request #2 from rakitzis/dev

Rename JSON fields to match new pickett