Minor fixes to type and field naming
Minor fixes to type and field naming

evestera/json_typegen,evestera/json_typegen,evestera/json_sample,evestera/json_typegen,evestera/json_sample,evestera/json_sample