diff --git a/aidedejeu_flutter/lib/models/items.dart b/aidedejeu_flutter/lib/models/items.dart
index 81279c54..0c6b13ee 100644
--- a/aidedejeu_flutter/lib/models/items.dart
+++ b/aidedejeu_flutter/lib/models/items.dart
@@ -5,21 +5,15 @@ part 'items.g.dart';
 
 @JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class Item {
-  @JsonKey(name: "Id")
   String id;
-  @JsonKey(name: "RootId")
   String rootId;
-  @JsonKey(name: "ParentLink")
   String parentLink;
-  @JsonKey(name: "Name")
   String name;
-  @JsonKey(name: "NormalizedName")
   String normalizedName;
-  @JsonKey(name: "ParentName")
   String parentName;
   int nameLevel;
-  String alias;
-  String aliasText;
+  String altName;
+  String altNameText;
   String normalizedAlias;
   String source;
   String markdown;
@@ -27,19 +21,8 @@ class Item {
   String itemType;
   List<Item> children;
 
+  Item();  
 
-Item();
-/*
-  Item(Map<String, dynamic> map) {
-    this.id = map["Id"];
-    this.rootId = map["RootId"];
-    this.name = map["Name"];
-    this.alias = map["AltName"];
-    this.aliasText = map["AltNameText"];
-    this.markdown = map["Markdown"];
-    this.itemType = map["ItemType"];
-  }
-*/
   factory Item.fromJson(Map<String, dynamic> map) => _$ItemFromJson(map);
   Map<String, dynamic> toJson() => _$ItemToJson(this);
 }
@@ -47,11 +30,12 @@ Item();
 @JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class GenericItem extends Item {
   GenericItem();
+
   factory GenericItem.fromJson(Map<String, dynamic> map) => _$GenericItemFromJson(map);
   Map<String, dynamic> toJson() => _$GenericItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class MonsterItem extends Item {
   String family;
   String type;
@@ -81,40 +65,11 @@ class MonsterItem extends Item {
 
   MonsterItem();
 
-/*
-  MonsterItem(Map<String, dynamic> map) : super(map) {
-    this.family = map["Family"];
-    this.type = map["Type"];
-    this.size = map["Size"];
-    this.alignment = map["Alignment"];
-    this.terrain = map["Terrain"];
-    this.legendary = map["Legendary"];
-    this.armorClass = map["ArmorClass"];
-    this.hitPoints = map["HitPoints"];
-    this.speed = map["Speed"];
-    this.strength = map["Strength"];
-    this.dexterity = map["Dexterity"];
-    this.constitution = map["Constitution"];
-    this.intelligence = map["Intelligence"];
-    this.wisdom = map["Wisdom"];
-    this.charisma = map["Charisma"];
-    this.savingThrows = map["SavingThrows"];
-    this.skills = map["Skills"];
-    this.damageVulnerabilities = map["DamageVulnerabilities"];
-    this.damageImmunities = map["DamageImmunities"];
-    this.conditionImmunities = map["ConditionImmunities"];
-    this.damageResistances = map["DamageResistances"];
-    this.senses = map["Senses"];
-    this.languages = map["Languages"];
-    this.challenge = map["Challenge"];
-    this.xp = map["XP"];
-  }
-  */
   factory MonsterItem.fromJson(Map<String, dynamic> map) => _$MonsterItemFromJson(map);
   Map<String, dynamic> toJson() => _$MonsterItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class SpellItem extends Item {
   String family;
   String level;
@@ -131,222 +86,197 @@ class SpellItem extends Item {
   String classes;
 
   SpellItem();
-/*  SpellItem(Map<String, dynamic> map) : super(map) {
-    this.family = map["Family"];
-    this.level = map["Level"];
-    this.type = map["Type"];
-    this.ritual = map["Ritual"];
-    this.castingTime = map["CastingTime"];
-    this.range = map["Range"];
-    this.components = map["Components"];
-    this.verbalComponent = map["VerbalComponent"];
-    this.somaticComponent = map["SomaticComponent"];
-    this.materialComponent = map["MaterialComponent"];
-    this.concentration = map["Concentration"];
-    this.duration = map["Duration"];
-    this.classes = map["Classes"];
-  }*/
+
   factory SpellItem.fromJson(Map<String, dynamic> map) => _$SpellItemFromJson(map);
   Map<String, dynamic> toJson() => _$SpellItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class Items extends Item {
   Items();
-//  Items(Map<String, dynamic> map) : super(map);
+
   factory Items.fromJson(Map<String, dynamic> map) => _$ItemsFromJson(map);
   Map<String, dynamic> toJson() => _$ItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class FilteredItems extends Items {
   String family;
 
   FilteredItems();
 
-/*  FilteredItems(Map<String, dynamic> map) : super(map) {
-    this.family = map["Family"];
-  }*/
-
+  @JsonKey(ignore: true)
   List<Filter> toFilterList() => [].toList();
 
   factory FilteredItems.fromJson(Map<String, dynamic> map) => _$FilteredItemsFromJson(map);
   Map<String, dynamic> toJson() => _$FilteredItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class MonsterItems extends FilteredItems {
-  String typesString;
-  String challengesString;
-  String sizesString;
-  String sourcesString;
-  String terrainsString;
+  String types;
+  String challenges;
+  String sizes;
+  String sources;
+  String terrains;
 
   @JsonKey(ignore: true)
-  Filter types;
-  @JsonKey(ignore: true)
-  Filter challenges;
-  @JsonKey(ignore: true)
-  Filter sizes;
-  @JsonKey(ignore: true)
-  Filter sources;
-  @JsonKey(ignore: true)
-  Filter terrains;
-
-  MonsterItems();
-
-/*  MonsterItems(Map<String, dynamic> map) : super(map) {
-    this.types = Filter(
+  Filter get typesFilter => Filter(
         name: "Types",
         displayName: "monstersTypes",
         type: FilterType.Choices,
-        values: map["Types"].toString().split("|"));
-    this.challenges = Filter(
+        values: types?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get challengesFilter => Filter(
         name: "Challenges",
         displayName: "monstersChallenges",
         type: FilterType.Range,
-        values: map["Challenges"].toString().split("|"));
-    this.sizes = Filter(
+        values: challenges?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get sizesFilter => Filter(
         name: "Sizes",
         displayName: "monstersSizes",
         type: FilterType.Range,
-        values: map["Sizes"].toString().split("|"));
-    this.sources = Filter(
+        values: sizes?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get sourcesFilter => Filter(
         name: "Sources",
         displayName: "monstersSources",
         type: FilterType.Choices,
-        values: map["Sources"].toString().split("|"));
-    this.terrains = Filter(
+        values: sources?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get terrainsFilter => Filter(
         name: "Terrains",
         displayName: "monstersTerrains",
         type: FilterType.Choices,
-        values: map["Terrains"].toString().split("|"));
-  }
-*/
+        values: terrains?.split("|"));
+
+  MonsterItems();
+
+  @JsonKey(ignore: true)
   List<Filter> toFilterList() => {
-        types,
-        challenges,
-        sizes,
-        sources,
-        terrains,
+        typesFilter,
+        challengesFilter,
+        sizesFilter,
+        sourcesFilter,
+        terrainsFilter,
       }.toList();
 
   factory MonsterItems.fromJson(Map<String, dynamic> map) => _$MonsterItemsFromJson(map);
   Map<String, dynamic> toJson() => _$MonsterItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class SpellItems extends FilteredItems {
-  @JsonKey(ignore: true)
-  Filter classes;
-  @JsonKey(ignore: true)
-  Filter levels;
-  @JsonKey(ignore: true)
-  Filter schools;
-  @JsonKey(ignore: true)
-  Filter rituals;
-  @JsonKey(ignore: true)
-  Filter castingTimes;
-  @JsonKey(ignore: true)
-  Filter ranges;
-  @JsonKey(ignore: true)
-  Filter verbalComponents;
-  @JsonKey(ignore: true)
-  Filter somaticComponents;
-  @JsonKey(ignore: true)
-  Filter materialComponents;
-  @JsonKey(ignore: true)
-  Filter concentrations;
-  @JsonKey(ignore: true)
-  Filter durations;
-  @JsonKey(ignore: true)
-  Filter sources;
+  String classes;
+  String levels;
+  String schools;
+  String rituals;
+  String castingTimes;
+  String ranges;
+  String verbalComponents;
+  String somaticComponents;
+  String materialComponents;
+  String concentrations;
+  String durations;
+  String sources;
 
-  SpellItems();
-
-/*  SpellItems(Map<String, dynamic> map) : super(map) {
-    this.classes = Filter(
+  @JsonKey(ignore: true)
+  Filter get classesFilter => Filter(
         name: "Classes",
         displayName: "spellsClasses",
         type: FilterType.Choices,
-        values: map["Classes"].toString().split("|"));
-    this.levels = Filter(
+        values: classes?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get levelsFilter => Filter(
         name: "Levels",
         displayName: "spellsLevels",
         type: FilterType.Choices,
-        values: map["Levels"].toString().split("|"));
-    this.schools = Filter(
+        values: levels?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get schoolsFilter => Filter(
         name: "Schools",
         displayName: "spellsSchools",
         type: FilterType.Choices,
-        values: map["Schools"].toString().split("|"));
-    this.rituals = Filter(
+        values: schools?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get ritualsFilter => Filter(
         name: "Rituals",
         displayName: "spellsRituals",
         type: FilterType.Choices,
-        values: map["Rituals"].toString().split("|"));
-    this.castingTimes = Filter(
+        values: rituals?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get castingTimesFilter => Filter(
         name: "CastingTimes",
         displayName: "spellsCastingTimes",
         type: FilterType.Choices,
-        values: map["CastingTimes"].toString().split("|"));
-    this.ranges = Filter(
+        values: castingTimes?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get rangesFilter => Filter(
         name: "Ranges",
         displayName: "spellsRanges",
         type: FilterType.Choices,
-        values: map["Ranges"].toString().split("|"));
-    this.verbalComponents = Filter(
+        values: ranges?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get verbalComponentsFilter => Filter(
         name: "VerbalComponents",
         displayName: "spellsVerbalComponents",
         type: FilterType.Choices,
-        values: map["VerbalComponents"].toString().split("|"));
-    this.somaticComponents = Filter(
+        values: verbalComponents?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get somaticComponentsFilter => Filter(
         name: "SomaticComponents",
         displayName: "spellsSomaticComponents",
         type: FilterType.Choices,
-        values: map["SomaticComponents"].toString().split("|"));
-    this.materialComponents = Filter(
+        values: somaticComponents?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get materialComponentsFilter => Filter(
         name: "MaterialComponents",
         displayName: "spellsMaterialComponents",
         type: FilterType.Choices,
-        values: map["MaterialComponents"].toString().split("|"));
-    this.concentrations = Filter(
+        values: materialComponents?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get concentrationsFilter => Filter(
         name: "Concentrations",
         displayName: "spellsConcentrations",
         type: FilterType.Choices,
-        values: map["Concentrations"].toString().split("|"));
-    this.durations = Filter(
+        values: concentrations?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get durationsFilter => Filter(
         name: "Durations",
         displayName: "spellsDurations",
         type: FilterType.Choices,
-        values: map["Durations"].toString().split("|"));
-    this.sources = Filter(
+        values: durations?.split("|"));
+  @JsonKey(ignore: true)
+  Filter get sourcesFilter => Filter(
         name: "Sources",
         displayName: "spellsSources",
         type: FilterType.Choices,
-        values: map["Sources"].toString().split("|"));
-  }
-*/
+        values: sources?.split("|"));
+
+  SpellItems();
+
+  @JsonKey(ignore: true)
   List<Filter> toFilterList() => {
-        classes,
-        levels,
-        schools,
-        rituals,
-        castingTimes,
-        ranges,
-        verbalComponents,
-        somaticComponents,
-        materialComponents,
-        concentrations,
-        durations,
-        sources,
+        classesFilter,
+        levelsFilter,
+        schoolsFilter,
+        ritualsFilter,
+        castingTimesFilter,
+        rangesFilter,
+        verbalComponentsFilter,
+        somaticComponentsFilter,
+        materialComponentsFilter,
+        concentrationsFilter,
+        durationsFilter,
+        sourcesFilter,
       }.toList();
 
   factory SpellItems.fromJson(Map<String, dynamic> map) => _$SpellItemsFromJson(map);
   Map<String, dynamic> toJson() => _$SpellItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class RaceItem extends Item {
   String fullName;
   bool hasSubRaces;
@@ -373,63 +303,36 @@ class RaceItem extends Item {
 
   RaceItem();
 
-/*  RaceItem(Map<String, dynamic> map) : super(map) {
-    this.fullName = map["FullName"];
-    this.hasSubRaces = map["HasSubRaces"] == "true";
-    this.strengthBonus = map["StrengthBonus"];
-    this.dexterityBonus = map["DexterityBonus"];
-    this.constitutionBonus = map["ConstitutionBonus"];
-    this.intelligenceBonus = map["IntelligenceBonus"];
-    this.wisdomBonus = map["WisdomBonus"];
-    this.charismaBonus = map["CharismaBonus"];
-    this.dispatchedBonus = map["DispatchedBonus"];
-    this.maxDispatchedStrengthBonus = map["MaxDispatchedStrengthBonus"];
-    this.maxDispatchedDexterityBonus = map["MaxDispatchedDexterityBonus"];
-    this.maxDispatchedConstitutionBonus = map["MaxDispatchedConstitutionBonus"];
-    this.maxDispatchedIntelligenceBonus = map["MaxDispatchedIntelligenceBonus"];
-    this.maxDispatchedWisdomBonus = map["MaxDispatchedWisdomBonus"];
-    this.maxDispatchedCharismaBonus = map["MaxDispatchedCharismaBonus"];
-    this.abilityScoreIncrease = map["AbilityScoreIncrease"];
-    this.age = map["Age"];
-    this.alignment = map["Alignment"];
-    this.size = map["Size"];
-    this.speed = map["Speed"];
-    this.darkvision = map["Darkvision"];
-    this.languages = map["Languages"];
-  }*/
   factory RaceItem.fromJson(Map<String, dynamic> map) => _$RaceItemFromJson(map);
   Map<String, dynamic> toJson() => _$RaceItemToJson(this);
-
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class SubRaceItem extends RaceItem {
   String parentRaceId;
 
   SubRaceItem();
 
-/*  SubRaceItem(Map<String, dynamic> map) : super(map) {
-    this.parentRaceId = map["ParentRaceId"];
-  }*/
   factory SubRaceItem.fromJson(Map<String, dynamic> map) => _$SubRaceItemFromJson(map);
   Map<String, dynamic> toJson() => _$SubRaceItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class RaceItems extends FilteredItems {
-//  RaceItems(Map<String, dynamic> map) : super(map);
 
   RaceItems();
 
+  @JsonKey(ignore: true)
   @override
   List<Filter> toFilterList() {
     return [].toList();
   }
+
   factory RaceItems.fromJson(Map<String, dynamic> map) => _$RaceItemsFromJson(map);
   Map<String, dynamic> toJson() => _$RaceItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class OriginItem extends Item {
   String regionsOfOrigin;
   String mainLanguages;
@@ -438,22 +341,16 @@ class OriginItem extends Item {
 
   OriginItem();
 
-/*  OriginItem(Map<String, dynamic> map) : super(map) {
-    this.regionsOfOrigin = map["RegionsOfOrigin"];
-    this.mainLanguages = map["MainLanguages"];
-    this.aspirations = map["Aspirations"];
-    this.availableSkills = map["AvailableSkills"];
-  }*/
   factory OriginItem.fromJson(Map<String, dynamic> map) => _$OriginItemFromJson(map);
   Map<String, dynamic> toJson() => _$OriginItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class OriginItems extends FilteredItems {
-//  OriginItems(Map<String, dynamic> map) : super(map);
 
   OriginItems();
 
+  @JsonKey(ignore: true)
   @override
   List<Filter> toFilterList() {
     return [].toList();
@@ -462,7 +359,7 @@ class OriginItems extends FilteredItems {
   Map<String, dynamic> toJson() => _$OriginItemsToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class BackgroundItem extends Item {
   String skillProficiencies;
   String masteredTools;
@@ -470,26 +367,21 @@ class BackgroundItem extends Item {
   String equipment;
 
   BackgroundItem();
-/*
-  BackgroundItem(Map<String, dynamic> map) : super(map) {
-    this.skillProficiencies = map["SkillProficiencies"];
-    this.masteredTools = map["MasteredTools"];
-    this.masteredLanguages = map["MasteredLanguages"];
-    this.equipment = map["Equipment"];
-  }*/
+
   factory BackgroundItem.fromJson(Map<String, dynamic> map) => _$BackgroundItemFromJson(map);
   Map<String, dynamic> toJson() => _$BackgroundItemToJson(this);
 }
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, fieldRename: FieldRename.pascal)
 class SubBackgroundItem extends BackgroundItem {
   SubBackgroundItem();
-//  SubBackgroundItem(Map<String, dynamic> map) : super(map);
+
   factory SubBackgroundItem.fromJson(Map<String, dynamic> map) => _$SubBackgroundItemFromJson(map);
   Map<String, dynamic> toJson() => _$SubBackgroundItemToJson(this);
 }
 
 Item itemFromMap(Map<String, dynamic> map) {
+
   switch (map["ItemType"]) {
     case "GenericItem":
       return GenericItem.fromJson(map);
diff --git a/aidedejeu_flutter/lib/models/items.g.dart b/aidedejeu_flutter/lib/models/items.g.dart
index 3751b9f3..e07a5ecc 100644
--- a/aidedejeu_flutter/lib/models/items.g.dart
+++ b/aidedejeu_flutter/lib/models/items.g.dart
@@ -15,8 +15,8 @@ Item _$ItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -36,8 +36,8 @@ Map<String, dynamic> _$ItemToJson(Item instance) => <String, dynamic>{
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
@@ -55,8 +55,8 @@ GenericItem _$GenericItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -77,8 +77,8 @@ Map<String, dynamic> _$GenericItemToJson(GenericItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
@@ -96,8 +96,8 @@ MonsterItem _$MonsterItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -107,31 +107,31 @@ MonsterItem _$MonsterItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String
-    ..type = json['type'] as String
-    ..size = json['size'] as String
-    ..alignment = json['alignment'] as String
-    ..terrain = json['terrain'] as String
-    ..legendary = json['legendary'] as String
-    ..armorClass = json['armorClass'] as String
-    ..hitPoints = json['hitPoints'] as String
-    ..speed = json['speed'] as String
-    ..strength = json['strength'] as String
-    ..dexterity = json['dexterity'] as String
-    ..constitution = json['constitution'] as String
-    ..intelligence = json['intelligence'] as String
-    ..wisdom = json['wisdom'] as String
-    ..charisma = json['charisma'] as String
-    ..savingThrows = json['savingThrows'] as String
-    ..skills = json['skills'] as String
-    ..damageVulnerabilities = json['damageVulnerabilities'] as String
-    ..damageImmunities = json['damageImmunities'] as String
-    ..conditionImmunities = json['conditionImmunities'] as String
-    ..damageResistances = json['damageResistances'] as String
-    ..senses = json['senses'] as String
-    ..languages = json['languages'] as String
-    ..challenge = json['challenge'] as String
-    ..xp = json['xp'] as int;
+    ..family = json['Family'] as String
+    ..type = json['Type'] as String
+    ..size = json['Size'] as String
+    ..alignment = json['Alignment'] as String
+    ..terrain = json['Terrain'] as String
+    ..legendary = json['Legendary'] as String
+    ..armorClass = json['ArmorClass'] as String
+    ..hitPoints = json['HitPoints'] as String
+    ..speed = json['Speed'] as String
+    ..strength = json['Strength'] as String
+    ..dexterity = json['Dexterity'] as String
+    ..constitution = json['Constitution'] as String
+    ..intelligence = json['Intelligence'] as String
+    ..wisdom = json['Wisdom'] as String
+    ..charisma = json['Charisma'] as String
+    ..savingThrows = json['SavingThrows'] as String
+    ..skills = json['Skills'] as String
+    ..damageVulnerabilities = json['DamageVulnerabilities'] as String
+    ..damageImmunities = json['DamageImmunities'] as String
+    ..conditionImmunities = json['ConditionImmunities'] as String
+    ..damageResistances = json['DamageResistances'] as String
+    ..senses = json['Senses'] as String
+    ..languages = json['Languages'] as String
+    ..challenge = json['Challenge'] as String
+    ..xp = json['Xp'] as int;
 }
 
 Map<String, dynamic> _$MonsterItemToJson(MonsterItem instance) =>
@@ -143,39 +143,39 @@ Map<String, dynamic> _$MonsterItemToJson(MonsterItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
-      'type': instance.type,
-      'size': instance.size,
-      'alignment': instance.alignment,
-      'terrain': instance.terrain,
-      'legendary': instance.legendary,
-      'armorClass': instance.armorClass,
-      'hitPoints': instance.hitPoints,
-      'speed': instance.speed,
-      'strength': instance.strength,
-      'dexterity': instance.dexterity,
-      'constitution': instance.constitution,
-      'intelligence': instance.intelligence,
-      'wisdom': instance.wisdom,
-      'charisma': instance.charisma,
-      'savingThrows': instance.savingThrows,
-      'skills': instance.skills,
-      'damageVulnerabilities': instance.damageVulnerabilities,
-      'damageImmunities': instance.damageImmunities,
-      'conditionImmunities': instance.conditionImmunities,
-      'damageResistances': instance.damageResistances,
-      'senses': instance.senses,
-      'languages': instance.languages,
-      'challenge': instance.challenge,
-      'xp': instance.xp,
+      'Family': instance.family,
+      'Type': instance.type,
+      'Size': instance.size,
+      'Alignment': instance.alignment,
+      'Terrain': instance.terrain,
+      'Legendary': instance.legendary,
+      'ArmorClass': instance.armorClass,
+      'HitPoints': instance.hitPoints,
+      'Speed': instance.speed,
+      'Strength': instance.strength,
+      'Dexterity': instance.dexterity,
+      'Constitution': instance.constitution,
+      'Intelligence': instance.intelligence,
+      'Wisdom': instance.wisdom,
+      'Charisma': instance.charisma,
+      'SavingThrows': instance.savingThrows,
+      'Skills': instance.skills,
+      'DamageVulnerabilities': instance.damageVulnerabilities,
+      'DamageImmunities': instance.damageImmunities,
+      'ConditionImmunities': instance.conditionImmunities,
+      'DamageResistances': instance.damageResistances,
+      'Senses': instance.senses,
+      'Languages': instance.languages,
+      'Challenge': instance.challenge,
+      'Xp': instance.xp,
     };
 
 SpellItem _$SpellItemFromJson(Map<String, dynamic> json) {
@@ -187,8 +187,8 @@ SpellItem _$SpellItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -198,19 +198,19 @@ SpellItem _$SpellItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String
-    ..level = json['level'] as String
-    ..type = json['type'] as String
-    ..ritual = json['ritual'] as String
-    ..castingTime = json['castingTime'] as String
-    ..range = json['range'] as String
-    ..components = json['components'] as String
-    ..verbalComponent = json['verbalComponent'] as String
-    ..somaticComponent = json['somaticComponent'] as String
-    ..materialComponent = json['materialComponent'] as String
-    ..concentration = json['concentration'] as String
-    ..duration = json['duration'] as String
-    ..classes = json['classes'] as String;
+    ..family = json['Family'] as String
+    ..level = json['Level'] as String
+    ..type = json['Type'] as String
+    ..ritual = json['Ritual'] as String
+    ..castingTime = json['CastingTime'] as String
+    ..range = json['Range'] as String
+    ..components = json['Components'] as String
+    ..verbalComponent = json['VerbalComponent'] as String
+    ..somaticComponent = json['SomaticComponent'] as String
+    ..materialComponent = json['MaterialComponent'] as String
+    ..concentration = json['Concentration'] as String
+    ..duration = json['Duration'] as String
+    ..classes = json['Classes'] as String;
 }
 
 Map<String, dynamic> _$SpellItemToJson(SpellItem instance) => <String, dynamic>{
@@ -221,27 +221,27 @@ Map<String, dynamic> _$SpellItemToJson(SpellItem instance) => <String, dynamic>{
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
-      'level': instance.level,
-      'type': instance.type,
-      'ritual': instance.ritual,
-      'castingTime': instance.castingTime,
-      'range': instance.range,
-      'components': instance.components,
-      'verbalComponent': instance.verbalComponent,
-      'somaticComponent': instance.somaticComponent,
-      'materialComponent': instance.materialComponent,
-      'concentration': instance.concentration,
-      'duration': instance.duration,
-      'classes': instance.classes,
+      'Family': instance.family,
+      'Level': instance.level,
+      'Type': instance.type,
+      'Ritual': instance.ritual,
+      'CastingTime': instance.castingTime,
+      'Range': instance.range,
+      'Components': instance.components,
+      'VerbalComponent': instance.verbalComponent,
+      'SomaticComponent': instance.somaticComponent,
+      'MaterialComponent': instance.materialComponent,
+      'Concentration': instance.concentration,
+      'Duration': instance.duration,
+      'Classes': instance.classes,
     };
 
 Items _$ItemsFromJson(Map<String, dynamic> json) {
@@ -253,8 +253,8 @@ Items _$ItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -274,8 +274,8 @@ Map<String, dynamic> _$ItemsToJson(Items instance) => <String, dynamic>{
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
@@ -293,8 +293,8 @@ FilteredItems _$FilteredItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -304,7 +304,7 @@ FilteredItems _$FilteredItemsFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String;
+    ..family = json['Family'] as String;
 }
 
 Map<String, dynamic> _$FilteredItemsToJson(FilteredItems instance) =>
@@ -316,15 +316,15 @@ Map<String, dynamic> _$FilteredItemsToJson(FilteredItems instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
+      'Family': instance.family,
     };
 
 MonsterItems _$MonsterItemsFromJson(Map<String, dynamic> json) {
@@ -336,8 +336,8 @@ MonsterItems _$MonsterItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -347,12 +347,12 @@ MonsterItems _$MonsterItemsFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String
-    ..typesString = json['typesString'] as String
-    ..challengesString = json['challengesString'] as String
-    ..sizesString = json['sizesString'] as String
-    ..sourcesString = json['sourcesString'] as String
-    ..terrainsString = json['terrainsString'] as String;
+    ..family = json['Family'] as String
+    ..types = json['Types'] as String
+    ..challenges = json['Challenges'] as String
+    ..sizes = json['Sizes'] as String
+    ..sources = json['Sources'] as String
+    ..terrains = json['Terrains'] as String;
 }
 
 Map<String, dynamic> _$MonsterItemsToJson(MonsterItems instance) =>
@@ -364,20 +364,20 @@ Map<String, dynamic> _$MonsterItemsToJson(MonsterItems instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
-      'typesString': instance.typesString,
-      'challengesString': instance.challengesString,
-      'sizesString': instance.sizesString,
-      'sourcesString': instance.sourcesString,
-      'terrainsString': instance.terrainsString,
+      'Family': instance.family,
+      'Types': instance.types,
+      'Challenges': instance.challenges,
+      'Sizes': instance.sizes,
+      'Sources': instance.sources,
+      'Terrains': instance.terrains,
     };
 
 SpellItems _$SpellItemsFromJson(Map<String, dynamic> json) {
@@ -389,8 +389,8 @@ SpellItems _$SpellItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -400,7 +400,19 @@ SpellItems _$SpellItemsFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String;
+    ..family = json['Family'] as String
+    ..classes = json['Classes'] as String
+    ..levels = json['Levels'] as String
+    ..schools = json['Schools'] as String
+    ..rituals = json['Rituals'] as String
+    ..castingTimes = json['CastingTimes'] as String
+    ..ranges = json['Ranges'] as String
+    ..verbalComponents = json['VerbalComponents'] as String
+    ..somaticComponents = json['SomaticComponents'] as String
+    ..materialComponents = json['MaterialComponents'] as String
+    ..concentrations = json['Concentrations'] as String
+    ..durations = json['Durations'] as String
+    ..sources = json['Sources'] as String;
 }
 
 Map<String, dynamic> _$SpellItemsToJson(SpellItems instance) =>
@@ -412,15 +424,27 @@ Map<String, dynamic> _$SpellItemsToJson(SpellItems instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
+      'Family': instance.family,
+      'Classes': instance.classes,
+      'Levels': instance.levels,
+      'Schools': instance.schools,
+      'Rituals': instance.rituals,
+      'CastingTimes': instance.castingTimes,
+      'Ranges': instance.ranges,
+      'VerbalComponents': instance.verbalComponents,
+      'SomaticComponents': instance.somaticComponents,
+      'MaterialComponents': instance.materialComponents,
+      'Concentrations': instance.concentrations,
+      'Durations': instance.durations,
+      'Sources': instance.sources,
     };
 
 RaceItem _$RaceItemFromJson(Map<String, dynamic> json) {
@@ -432,8 +456,8 @@ RaceItem _$RaceItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -443,31 +467,31 @@ RaceItem _$RaceItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..fullName = json['fullName'] as String
-    ..hasSubRaces = json['hasSubRaces'] as bool
-    ..strengthBonus = json['strengthBonus'] as String
-    ..dexterityBonus = json['dexterityBonus'] as String
-    ..constitutionBonus = json['constitutionBonus'] as String
-    ..intelligenceBonus = json['intelligenceBonus'] as String
-    ..wisdomBonus = json['wisdomBonus'] as String
-    ..charismaBonus = json['charismaBonus'] as String
-    ..dispatchedBonus = json['dispatchedBonus'] as String
-    ..maxDispatchedStrengthBonus = json['maxDispatchedStrengthBonus'] as String
+    ..fullName = json['FullName'] as String
+    ..hasSubRaces = json['HasSubRaces'] as bool
+    ..strengthBonus = json['StrengthBonus'] as String
+    ..dexterityBonus = json['DexterityBonus'] as String
+    ..constitutionBonus = json['ConstitutionBonus'] as String
+    ..intelligenceBonus = json['IntelligenceBonus'] as String
+    ..wisdomBonus = json['WisdomBonus'] as String
+    ..charismaBonus = json['CharismaBonus'] as String
+    ..dispatchedBonus = json['DispatchedBonus'] as String
+    ..maxDispatchedStrengthBonus = json['MaxDispatchedStrengthBonus'] as String
     ..maxDispatchedDexterityBonus =
-        json['maxDispatchedDexterityBonus'] as String
+        json['MaxDispatchedDexterityBonus'] as String
     ..maxDispatchedConstitutionBonus =
-        json['maxDispatchedConstitutionBonus'] as String
+        json['MaxDispatchedConstitutionBonus'] as String
     ..maxDispatchedIntelligenceBonus =
-        json['maxDispatchedIntelligenceBonus'] as String
-    ..maxDispatchedWisdomBonus = json['maxDispatchedWisdomBonus'] as String
-    ..maxDispatchedCharismaBonus = json['maxDispatchedCharismaBonus'] as String
-    ..abilityScoreIncrease = json['abilityScoreIncrease'] as String
-    ..age = json['age'] as String
-    ..alignment = json['alignment'] as String
-    ..size = json['size'] as String
-    ..speed = json['speed'] as String
-    ..darkvision = json['darkvision'] as String
-    ..languages = json['languages'] as String;
+        json['MaxDispatchedIntelligenceBonus'] as String
+    ..maxDispatchedWisdomBonus = json['MaxDispatchedWisdomBonus'] as String
+    ..maxDispatchedCharismaBonus = json['MaxDispatchedCharismaBonus'] as String
+    ..abilityScoreIncrease = json['AbilityScoreIncrease'] as String
+    ..age = json['Age'] as String
+    ..alignment = json['Alignment'] as String
+    ..size = json['Size'] as String
+    ..speed = json['Speed'] as String
+    ..darkvision = json['Darkvision'] as String
+    ..languages = json['Languages'] as String;
 }
 
 Map<String, dynamic> _$RaceItemToJson(RaceItem instance) => <String, dynamic>{
@@ -478,36 +502,36 @@ Map<String, dynamic> _$RaceItemToJson(RaceItem instance) => <String, dynamic>{
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'fullName': instance.fullName,
-      'hasSubRaces': instance.hasSubRaces,
-      'strengthBonus': instance.strengthBonus,
-      'dexterityBonus': instance.dexterityBonus,
-      'constitutionBonus': instance.constitutionBonus,
-      'intelligenceBonus': instance.intelligenceBonus,
-      'wisdomBonus': instance.wisdomBonus,
-      'charismaBonus': instance.charismaBonus,
-      'dispatchedBonus': instance.dispatchedBonus,
-      'maxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
-      'maxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
-      'maxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
-      'maxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
-      'maxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
-      'maxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
-      'abilityScoreIncrease': instance.abilityScoreIncrease,
-      'age': instance.age,
-      'alignment': instance.alignment,
-      'size': instance.size,
-      'speed': instance.speed,
-      'darkvision': instance.darkvision,
-      'languages': instance.languages,
+      'FullName': instance.fullName,
+      'HasSubRaces': instance.hasSubRaces,
+      'StrengthBonus': instance.strengthBonus,
+      'DexterityBonus': instance.dexterityBonus,
+      'ConstitutionBonus': instance.constitutionBonus,
+      'IntelligenceBonus': instance.intelligenceBonus,
+      'WisdomBonus': instance.wisdomBonus,
+      'CharismaBonus': instance.charismaBonus,
+      'DispatchedBonus': instance.dispatchedBonus,
+      'MaxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
+      'MaxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
+      'MaxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
+      'MaxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
+      'MaxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
+      'MaxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
+      'AbilityScoreIncrease': instance.abilityScoreIncrease,
+      'Age': instance.age,
+      'Alignment': instance.alignment,
+      'Size': instance.size,
+      'Speed': instance.speed,
+      'Darkvision': instance.darkvision,
+      'Languages': instance.languages,
     };
 
 SubRaceItem _$SubRaceItemFromJson(Map<String, dynamic> json) {
@@ -519,8 +543,8 @@ SubRaceItem _$SubRaceItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -530,32 +554,32 @@ SubRaceItem _$SubRaceItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..fullName = json['fullName'] as String
-    ..hasSubRaces = json['hasSubRaces'] as bool
-    ..strengthBonus = json['strengthBonus'] as String
-    ..dexterityBonus = json['dexterityBonus'] as String
-    ..constitutionBonus = json['constitutionBonus'] as String
-    ..intelligenceBonus = json['intelligenceBonus'] as String
-    ..wisdomBonus = json['wisdomBonus'] as String
-    ..charismaBonus = json['charismaBonus'] as String
-    ..dispatchedBonus = json['dispatchedBonus'] as String
-    ..maxDispatchedStrengthBonus = json['maxDispatchedStrengthBonus'] as String
+    ..fullName = json['FullName'] as String
+    ..hasSubRaces = json['HasSubRaces'] as bool
+    ..strengthBonus = json['StrengthBonus'] as String
+    ..dexterityBonus = json['DexterityBonus'] as String
+    ..constitutionBonus = json['ConstitutionBonus'] as String
+    ..intelligenceBonus = json['IntelligenceBonus'] as String
+    ..wisdomBonus = json['WisdomBonus'] as String
+    ..charismaBonus = json['CharismaBonus'] as String
+    ..dispatchedBonus = json['DispatchedBonus'] as String
+    ..maxDispatchedStrengthBonus = json['MaxDispatchedStrengthBonus'] as String
     ..maxDispatchedDexterityBonus =
-        json['maxDispatchedDexterityBonus'] as String
+        json['MaxDispatchedDexterityBonus'] as String
     ..maxDispatchedConstitutionBonus =
-        json['maxDispatchedConstitutionBonus'] as String
+        json['MaxDispatchedConstitutionBonus'] as String
     ..maxDispatchedIntelligenceBonus =
-        json['maxDispatchedIntelligenceBonus'] as String
-    ..maxDispatchedWisdomBonus = json['maxDispatchedWisdomBonus'] as String
-    ..maxDispatchedCharismaBonus = json['maxDispatchedCharismaBonus'] as String
-    ..abilityScoreIncrease = json['abilityScoreIncrease'] as String
-    ..age = json['age'] as String
-    ..alignment = json['alignment'] as String
-    ..size = json['size'] as String
-    ..speed = json['speed'] as String
-    ..darkvision = json['darkvision'] as String
-    ..languages = json['languages'] as String
-    ..parentRaceId = json['parentRaceId'] as String;
+        json['MaxDispatchedIntelligenceBonus'] as String
+    ..maxDispatchedWisdomBonus = json['MaxDispatchedWisdomBonus'] as String
+    ..maxDispatchedCharismaBonus = json['MaxDispatchedCharismaBonus'] as String
+    ..abilityScoreIncrease = json['AbilityScoreIncrease'] as String
+    ..age = json['Age'] as String
+    ..alignment = json['Alignment'] as String
+    ..size = json['Size'] as String
+    ..speed = json['Speed'] as String
+    ..darkvision = json['Darkvision'] as String
+    ..languages = json['Languages'] as String
+    ..parentRaceId = json['ParentRaceId'] as String;
 }
 
 Map<String, dynamic> _$SubRaceItemToJson(SubRaceItem instance) =>
@@ -567,37 +591,37 @@ Map<String, dynamic> _$SubRaceItemToJson(SubRaceItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'fullName': instance.fullName,
-      'hasSubRaces': instance.hasSubRaces,
-      'strengthBonus': instance.strengthBonus,
-      'dexterityBonus': instance.dexterityBonus,
-      'constitutionBonus': instance.constitutionBonus,
-      'intelligenceBonus': instance.intelligenceBonus,
-      'wisdomBonus': instance.wisdomBonus,
-      'charismaBonus': instance.charismaBonus,
-      'dispatchedBonus': instance.dispatchedBonus,
-      'maxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
-      'maxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
-      'maxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
-      'maxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
-      'maxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
-      'maxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
-      'abilityScoreIncrease': instance.abilityScoreIncrease,
-      'age': instance.age,
-      'alignment': instance.alignment,
-      'size': instance.size,
-      'speed': instance.speed,
-      'darkvision': instance.darkvision,
-      'languages': instance.languages,
-      'parentRaceId': instance.parentRaceId,
+      'FullName': instance.fullName,
+      'HasSubRaces': instance.hasSubRaces,
+      'StrengthBonus': instance.strengthBonus,
+      'DexterityBonus': instance.dexterityBonus,
+      'ConstitutionBonus': instance.constitutionBonus,
+      'IntelligenceBonus': instance.intelligenceBonus,
+      'WisdomBonus': instance.wisdomBonus,
+      'CharismaBonus': instance.charismaBonus,
+      'DispatchedBonus': instance.dispatchedBonus,
+      'MaxDispatchedStrengthBonus': instance.maxDispatchedStrengthBonus,
+      'MaxDispatchedDexterityBonus': instance.maxDispatchedDexterityBonus,
+      'MaxDispatchedConstitutionBonus': instance.maxDispatchedConstitutionBonus,
+      'MaxDispatchedIntelligenceBonus': instance.maxDispatchedIntelligenceBonus,
+      'MaxDispatchedWisdomBonus': instance.maxDispatchedWisdomBonus,
+      'MaxDispatchedCharismaBonus': instance.maxDispatchedCharismaBonus,
+      'AbilityScoreIncrease': instance.abilityScoreIncrease,
+      'Age': instance.age,
+      'Alignment': instance.alignment,
+      'Size': instance.size,
+      'Speed': instance.speed,
+      'Darkvision': instance.darkvision,
+      'Languages': instance.languages,
+      'ParentRaceId': instance.parentRaceId,
     };
 
 RaceItems _$RaceItemsFromJson(Map<String, dynamic> json) {
@@ -609,8 +633,8 @@ RaceItems _$RaceItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -620,7 +644,7 @@ RaceItems _$RaceItemsFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String;
+    ..family = json['Family'] as String;
 }
 
 Map<String, dynamic> _$RaceItemsToJson(RaceItems instance) => <String, dynamic>{
@@ -631,15 +655,15 @@ Map<String, dynamic> _$RaceItemsToJson(RaceItems instance) => <String, dynamic>{
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
+      'Family': instance.family,
     };
 
 OriginItem _$OriginItemFromJson(Map<String, dynamic> json) {
@@ -651,8 +675,8 @@ OriginItem _$OriginItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -662,10 +686,10 @@ OriginItem _$OriginItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..regionsOfOrigin = json['regionsOfOrigin'] as String
-    ..mainLanguages = json['mainLanguages'] as String
-    ..aspirations = json['aspirations'] as String
-    ..availableSkills = json['availableSkills'] as String;
+    ..regionsOfOrigin = json['RegionsOfOrigin'] as String
+    ..mainLanguages = json['MainLanguages'] as String
+    ..aspirations = json['Aspirations'] as String
+    ..availableSkills = json['AvailableSkills'] as String;
 }
 
 Map<String, dynamic> _$OriginItemToJson(OriginItem instance) =>
@@ -677,18 +701,18 @@ Map<String, dynamic> _$OriginItemToJson(OriginItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'regionsOfOrigin': instance.regionsOfOrigin,
-      'mainLanguages': instance.mainLanguages,
-      'aspirations': instance.aspirations,
-      'availableSkills': instance.availableSkills,
+      'RegionsOfOrigin': instance.regionsOfOrigin,
+      'MainLanguages': instance.mainLanguages,
+      'Aspirations': instance.aspirations,
+      'AvailableSkills': instance.availableSkills,
     };
 
 OriginItems _$OriginItemsFromJson(Map<String, dynamic> json) {
@@ -700,8 +724,8 @@ OriginItems _$OriginItemsFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -711,7 +735,7 @@ OriginItems _$OriginItemsFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..family = json['family'] as String;
+    ..family = json['Family'] as String;
 }
 
 Map<String, dynamic> _$OriginItemsToJson(OriginItems instance) =>
@@ -723,15 +747,15 @@ Map<String, dynamic> _$OriginItemsToJson(OriginItems instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'family': instance.family,
+      'Family': instance.family,
     };
 
 BackgroundItem _$BackgroundItemFromJson(Map<String, dynamic> json) {
@@ -743,8 +767,8 @@ BackgroundItem _$BackgroundItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -754,10 +778,10 @@ BackgroundItem _$BackgroundItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..skillProficiencies = json['skillProficiencies'] as String
-    ..masteredTools = json['masteredTools'] as String
-    ..masteredLanguages = json['masteredLanguages'] as String
-    ..equipment = json['equipment'] as String;
+    ..skillProficiencies = json['SkillProficiencies'] as String
+    ..masteredTools = json['MasteredTools'] as String
+    ..masteredLanguages = json['MasteredLanguages'] as String
+    ..equipment = json['Equipment'] as String;
 }
 
 Map<String, dynamic> _$BackgroundItemToJson(BackgroundItem instance) =>
@@ -769,18 +793,18 @@ Map<String, dynamic> _$BackgroundItemToJson(BackgroundItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'skillProficiencies': instance.skillProficiencies,
-      'masteredTools': instance.masteredTools,
-      'masteredLanguages': instance.masteredLanguages,
-      'equipment': instance.equipment,
+      'SkillProficiencies': instance.skillProficiencies,
+      'MasteredTools': instance.masteredTools,
+      'MasteredLanguages': instance.masteredLanguages,
+      'Equipment': instance.equipment,
     };
 
 SubBackgroundItem _$SubBackgroundItemFromJson(Map<String, dynamic> json) {
@@ -792,8 +816,8 @@ SubBackgroundItem _$SubBackgroundItemFromJson(Map<String, dynamic> json) {
     ..normalizedName = json['NormalizedName'] as String
     ..parentName = json['ParentName'] as String
     ..nameLevel = json['NameLevel'] as int
-    ..alias = json['Alias'] as String
-    ..aliasText = json['AliasText'] as String
+    ..altName = json['AltName'] as String
+    ..altNameText = json['AltNameText'] as String
     ..normalizedAlias = json['NormalizedAlias'] as String
     ..source = json['Source'] as String
     ..markdown = json['Markdown'] as String
@@ -803,10 +827,10 @@ SubBackgroundItem _$SubBackgroundItemFromJson(Map<String, dynamic> json) {
         ?.map(
             (e) => e == null ? null : Item.fromJson(e as Map<String, dynamic>))
         ?.toList()
-    ..skillProficiencies = json['skillProficiencies'] as String
-    ..masteredTools = json['masteredTools'] as String
-    ..masteredLanguages = json['masteredLanguages'] as String
-    ..equipment = json['equipment'] as String;
+    ..skillProficiencies = json['SkillProficiencies'] as String
+    ..masteredTools = json['MasteredTools'] as String
+    ..masteredLanguages = json['MasteredLanguages'] as String
+    ..equipment = json['Equipment'] as String;
 }
 
 Map<String, dynamic> _$SubBackgroundItemToJson(SubBackgroundItem instance) =>
@@ -818,16 +842,16 @@ Map<String, dynamic> _$SubBackgroundItemToJson(SubBackgroundItem instance) =>
       'NormalizedName': instance.normalizedName,
       'ParentName': instance.parentName,
       'NameLevel': instance.nameLevel,
-      'Alias': instance.alias,
-      'AliasText': instance.aliasText,
+      'AltName': instance.altName,
+      'AltNameText': instance.altNameText,
       'NormalizedAlias': instance.normalizedAlias,
       'Source': instance.source,
       'Markdown': instance.markdown,
       'FullText': instance.fullText,
       'ItemType': instance.itemType,
       'Children': instance.children?.map((e) => e?.toJson())?.toList(),
-      'skillProficiencies': instance.skillProficiencies,
-      'masteredTools': instance.masteredTools,
-      'masteredLanguages': instance.masteredLanguages,
-      'equipment': instance.equipment,
+      'SkillProficiencies': instance.skillProficiencies,
+      'MasteredTools': instance.masteredTools,
+      'MasteredLanguages': instance.masteredLanguages,
+      'Equipment': instance.equipment,
     };