diff --git a/lib/application/artifact/artifact_bloc.dart b/lib/application/artifact/artifact_bloc.dart
index a21edc9cc..ed790f974 100644
--- a/lib/application/artifact/artifact_bloc.dart
+++ b/lib/application/artifact/artifact_bloc.dart
@@ -31,7 +31,7 @@ class ArtifactBloc extends PopBloc<ArtifactEvent, ArtifactState> {
       loadArtifact: (e) async {
         final artifact = _genshinService.getArtifact(e.key);
         final translation = _genshinService.getArtifactTranslation(e.key);
-        final charImgs = _genshinService.getCharactersImgUsingArtifact(e.key);
+        final charImgs = _genshinService.getCharacterImgsUsingArtifact(e.key);
 
         var image = artifact.image.split('.png').first;
         image = image.substring(0, image.length - 1);
diff --git a/lib/application/weapon/weapon_bloc.dart b/lib/application/weapon/weapon_bloc.dart
index 4c751147a..1b6bf4cfa 100644
--- a/lib/application/weapon/weapon_bloc.dart
+++ b/lib/application/weapon/weapon_bloc.dart
@@ -52,7 +52,7 @@ class WeaponBloc extends PopBloc<WeaponEvent, WeaponState> {
   }
 
   WeaponState _buildInitialState(WeaponFileModel weapon, TranslationWeaponFile translation) {
-    final charImgs = _genshinService.getCharactersImgUsingWeapon(weapon.key);
+    final charImgs = _genshinService.getCharacterImgsUsingWeapon(weapon.key);
     return WeaponState.loaded(
       name: translation.name,
       weaponType: weapon.type,
diff --git a/lib/application/weapon/weapon_state.dart b/lib/application/weapon/weapon_state.dart
index 1a5d2a944..2e8f7e1a4 100644
--- a/lib/application/weapon/weapon_state.dart
+++ b/lib/application/weapon/weapon_state.dart
@@ -17,6 +17,6 @@ abstract class WeaponState with _$WeaponState {
     @required List<WeaponFileRefinementModel> refinements,
     @required List<String> charImages,
     @required List<WeaponFileStatModel> stats,
-    @required List<WeaponCraftedFileModel> craftingMaterials,
+    @required List<ItemAscensionMaterialModel> craftingMaterials,
   }) = _LoadedState;
 }
diff --git a/lib/domain/models/db/weapons/weapon_file_model.dart b/lib/domain/models/db/weapons/weapon_file_model.dart
index 6e1cce51e..27b8d3287 100644
--- a/lib/domain/models/db/weapons/weapon_file_model.dart
+++ b/lib/domain/models/db/weapons/weapon_file_model.dart
@@ -72,4 +72,4 @@ abstract class WeaponFileStatModel implements _$WeaponFileStatModel {
   const WeaponFileStatModel._();
 
   factory WeaponFileStatModel.fromJson(Map<String, dynamic> json) => _$WeaponFileStatModelFromJson(json);
-}
\ No newline at end of file
+}