changed json firlds for consistant nameing