fix JSON view model classes to use new JSON structure
rename identifier -> id to make JSON smaller