Fixed json errors; updated names