diff --git a/mvt/android/artifacts/dumpsys_accessibility.py b/mvt/android/artifacts/dumpsys_accessibility.py
index 5755c2c..c932e70 100644
--- a/mvt/android/artifacts/dumpsys_accessibility.py
+++ b/mvt/android/artifacts/dumpsys_accessibility.py
@@ -5,7 +5,7 @@
 from .artifact import AndroidArtifact
 
 
-class DumpsysAccessibility(AndroidArtifact):
+class DumpsysAccessibilityArtifact(AndroidArtifact):
     def check_indicators(self) -> None:
         if not self.indicators:
             return
diff --git a/mvt/android/artifacts/dumpsys_appops.py b/mvt/android/artifacts/dumpsys_appops.py
index 24fb8b5..8592167 100644
--- a/mvt/android/artifacts/dumpsys_appops.py
+++ b/mvt/android/artifacts/dumpsys_appops.py
@@ -10,7 +10,7 @@ from mvt.common.utils import convert_datetime_to_iso
 from .artifact import AndroidArtifact
 
 
-class DumpsysAppops(AndroidArtifact):
+class DumpsysAppopsArtifact(AndroidArtifact):
     """
     Parser for dumpsys app ops info
     """
diff --git a/mvt/android/artifacts/dumpsys_dbinfo.py b/mvt/android/artifacts/dumpsys_dbinfo.py
index f6d1ad5..00e2ffa 100644
--- a/mvt/android/artifacts/dumpsys_dbinfo.py
+++ b/mvt/android/artifacts/dumpsys_dbinfo.py
@@ -7,7 +7,7 @@ import re
 from .artifact import AndroidArtifact
 
 
-class DumpsysDBInfo(AndroidArtifact):
+class DumpsysDBInfoArtifact(AndroidArtifact):
     """
     Parser for dumpsys DBInfo service
     """
diff --git a/mvt/android/artifacts/dumpsys_package_activities.py b/mvt/android/artifacts/dumpsys_package_activities.py
index 6f2f1fd..db61c13 100644
--- a/mvt/android/artifacts/dumpsys_package_activities.py
+++ b/mvt/android/artifacts/dumpsys_package_activities.py
@@ -5,7 +5,7 @@
 from .artifact import AndroidArtifact
 
 
-class DumpsysPackageActivities(AndroidArtifact):
+class DumpsysPackageActivitiesArtifact(AndroidArtifact):
     def check_indicators(self) -> None:
         if not self.indicators:
             return
diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py
index 764d0b9..d7ada15 100644
--- a/mvt/android/modules/adb/dumpsys_accessibility.py
+++ b/mvt/android/modules/adb/dumpsys_accessibility.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibility as DAA
+from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibilityArtifact
 
 from .base import AndroidExtraction
 
 
-class DumpsysAccessibility(DAA, AndroidExtraction):
+class DumpsysAccessibility(DumpsysAccessibilityArtifact, AndroidExtraction):
     """This module extracts stats on accessibility."""
 
     def __init__(
diff --git a/mvt/android/modules/adb/dumpsys_activities.py b/mvt/android/modules/adb/dumpsys_activities.py
index b000863..f0741c4 100644
--- a/mvt/android/modules/adb/dumpsys_activities.py
+++ b/mvt/android/modules/adb/dumpsys_activities.py
@@ -6,12 +6,14 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_package_activities import DumpsysPackageActivities
+from mvt.android.artifacts.dumpsys_package_activities import (
+    DumpsysPackageActivitiesArtifact,
+)
 
 from .base import AndroidExtraction
 
 
-class DumpsysActivities(DumpsysPackageActivities, AndroidExtraction):
+class DumpsysActivities(DumpsysPackageActivitiesArtifact, AndroidExtraction):
     """This module extracts details on receivers for risky activities."""
 
     def __init__(
diff --git a/mvt/android/modules/adb/dumpsys_appops.py b/mvt/android/modules/adb/dumpsys_appops.py
index 882f1b9..119fa5b 100644
--- a/mvt/android/modules/adb/dumpsys_appops.py
+++ b/mvt/android/modules/adb/dumpsys_appops.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_appops import DumpsysAppops as DAO
+from mvt.android.artifacts.dumpsys_appops import DumpsysAppopsArtifact
 
 from .base import AndroidExtraction
 
 
-class DumpsysAppOps(DAO, AndroidExtraction):
+class DumpsysAppOps(DumpsysAppopsArtifact, AndroidExtraction):
     """This module extracts records from App-op Manager."""
 
     slug = "dumpsys_appops"
diff --git a/mvt/android/modules/adb/dumpsys_dbinfo.py b/mvt/android/modules/adb/dumpsys_dbinfo.py
index 2255ed6..a0a5734 100644
--- a/mvt/android/modules/adb/dumpsys_dbinfo.py
+++ b/mvt/android/modules/adb/dumpsys_dbinfo.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfo as DBI
+from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfoArtifact
 
 from .base import AndroidExtraction
 
 
-class DumpsysDBInfo(DBI, AndroidExtraction):
+class DumpsysDBInfo(DumpsysDBInfoArtifact, AndroidExtraction):
     """This module extracts records from battery daily updates."""
 
     slug = "dumpsys_dbinfo"
diff --git a/mvt/android/modules/androidqf/dumpsys_accessibility.py b/mvt/android/modules/androidqf/dumpsys_accessibility.py
index 04af10d..ef24eb9 100644
--- a/mvt/android/modules/androidqf/dumpsys_accessibility.py
+++ b/mvt/android/modules/androidqf/dumpsys_accessibility.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibility as DAA
+from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibilityArtifact
 
 from .base import AndroidQFModule
 
 
-class DumpsysAccessibility(DAA, AndroidQFModule):
+class DumpsysAccessibility(DumpsysAccessibilityArtifact, AndroidQFModule):
     """This module analyse dumpsys accessbility"""
 
     def __init__(
diff --git a/mvt/android/modules/androidqf/dumpsys_activities.py b/mvt/android/modules/androidqf/dumpsys_activities.py
index 6bdf14d..6443239 100644
--- a/mvt/android/modules/androidqf/dumpsys_activities.py
+++ b/mvt/android/modules/androidqf/dumpsys_activities.py
@@ -6,12 +6,14 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_package_activities import DumpsysPackageActivities
+from mvt.android.artifacts.dumpsys_package_activities import (
+    DumpsysPackageActivitiesArtifact,
+)
 
 from .base import AndroidQFModule
 
 
-class DumpsysActivities(DumpsysPackageActivities, AndroidQFModule):
+class DumpsysActivities(DumpsysPackageActivitiesArtifact, AndroidQFModule):
     """This module extracts details on receivers for risky activities."""
 
     def __init__(
diff --git a/mvt/android/modules/androidqf/dumpsys_appops.py b/mvt/android/modules/androidqf/dumpsys_appops.py
index 9e6bf44..6c71117 100644
--- a/mvt/android/modules/androidqf/dumpsys_appops.py
+++ b/mvt/android/modules/androidqf/dumpsys_appops.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_appops import DumpsysAppops as DAO
+from mvt.android.artifacts.dumpsys_appops import DumpsysAppopsArtifact
 
 from .base import AndroidQFModule
 
 
-class DumpsysAppops(DAO, AndroidQFModule):
+class DumpsysAppops(DumpsysAppopsArtifact, AndroidQFModule):
     def __init__(
         self,
         file_path: Optional[str] = None,
diff --git a/mvt/android/modules/androidqf/dumpsys_dbinfo.py b/mvt/android/modules/androidqf/dumpsys_dbinfo.py
index 7af91ea..8fb116c 100644
--- a/mvt/android/modules/androidqf/dumpsys_dbinfo.py
+++ b/mvt/android/modules/androidqf/dumpsys_dbinfo.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfo as DBI
+from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfoArtifact
 
 from .base import AndroidQFModule
 
 
-class DumpsysDBInfo(DBI, AndroidQFModule):
+class DumpsysDBInfo(DumpsysDBInfoArtifact, AndroidQFModule):
     def __init__(
         self,
         file_path: Optional[str] = None,
diff --git a/mvt/android/modules/bugreport/accessibility.py b/mvt/android/modules/bugreport/accessibility.py
index 4d9098c..d757c36 100644
--- a/mvt/android/modules/bugreport/accessibility.py
+++ b/mvt/android/modules/bugreport/accessibility.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibility as DAA
+from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibilityArtifact
 
 from .base import BugReportModule
 
 
-class Accessibility(DAA, BugReportModule):
+class Accessibility(DumpsysAccessibilityArtifact, BugReportModule):
     """This module extracts stats on accessibility."""
 
     def __init__(
diff --git a/mvt/android/modules/bugreport/activities.py b/mvt/android/modules/bugreport/activities.py
index 556f3bb..6440bf7 100644
--- a/mvt/android/modules/bugreport/activities.py
+++ b/mvt/android/modules/bugreport/activities.py
@@ -6,12 +6,14 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_package_activities import DumpsysPackageActivities
+from mvt.android.artifacts.dumpsys_package_activities import (
+    DumpsysPackageActivitiesArtifact,
+)
 
 from .base import BugReportModule
 
 
-class Activities(DumpsysPackageActivities, BugReportModule):
+class Activities(DumpsysPackageActivitiesArtifact, BugReportModule):
     """This module extracts details on receivers for risky activities."""
 
     def __init__(
diff --git a/mvt/android/modules/bugreport/appops.py b/mvt/android/modules/bugreport/appops.py
index e5ef0ae..2f5b53e 100644
--- a/mvt/android/modules/bugreport/appops.py
+++ b/mvt/android/modules/bugreport/appops.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_appops import DumpsysAppops
+from mvt.android.artifacts.dumpsys_appops import DumpsysAppopsArtifact
 
 from .base import BugReportModule
 
 
-class Appops(DumpsysAppops, BugReportModule):
+class Appops(DumpsysAppopsArtifact, BugReportModule):
     """This module extracts information on package from App-Ops Manager."""
 
     def __init__(
diff --git a/mvt/android/modules/bugreport/dbinfo.py b/mvt/android/modules/bugreport/dbinfo.py
index 40502ee..cab998c 100644
--- a/mvt/android/modules/bugreport/dbinfo.py
+++ b/mvt/android/modules/bugreport/dbinfo.py
@@ -6,12 +6,12 @@
 import logging
 from typing import Optional
 
-from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfo
+from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfoArtifact
 
 from .base import BugReportModule
 
 
-class DBInfo(DumpsysDBInfo, BugReportModule):
+class DBInfo(DumpsysDBInfoArtifact, BugReportModule):
     """This module extracts records from battery daily updates."""
 
     slug = "dbinfo"
diff --git a/tests/android/test_artifact_dumpsys_accessibility.py b/tests/android/test_artifact_dumpsys_accessibility.py
index f18407e..a23f6c7 100644
--- a/tests/android/test_artifact_dumpsys_accessibility.py
+++ b/tests/android/test_artifact_dumpsys_accessibility.py
@@ -4,7 +4,7 @@
 #   https://license.mvt.re/1.1/
 import logging
 
-from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibility
+from mvt.android.artifacts.dumpsys_accessibility import DumpsysAccessibilityArtifact
 from mvt.common.indicators import Indicators
 
 from ..utils import get_artifact
@@ -12,7 +12,7 @@ from ..utils import get_artifact
 
 class TestDumpsysAccessibilityArtifact:
     def test_parsing(self):
-        da = DumpsysAccessibility()
+        da = DumpsysAccessibilityArtifact()
         file = get_artifact("android_data/dumpsys_accessibility.txt")
         with open(file) as f:
             data = f.read()
@@ -27,7 +27,7 @@ class TestDumpsysAccessibilityArtifact:
         )
 
     def test_ioc_check(self, indicator_file):
-        da = DumpsysAccessibility()
+        da = DumpsysAccessibilityArtifact()
         file = get_artifact("android_data/dumpsys_accessibility.txt")
         with open(file) as f:
             data = f.read()
diff --git a/tests/android/test_artifact_dumpsys_appops.py b/tests/android/test_artifact_dumpsys_appops.py
index 489c2d9..b4ceb68 100644
--- a/tests/android/test_artifact_dumpsys_appops.py
+++ b/tests/android/test_artifact_dumpsys_appops.py
@@ -4,7 +4,7 @@
 #   https://license.mvt.re/1.1/
 import logging
 
-from mvt.android.artifacts.dumpsys_appops import DumpsysAppops
+from mvt.android.artifacts.dumpsys_appops import DumpsysAppopsArtifact
 from mvt.common.indicators import Indicators
 
 from ..utils import get_artifact
@@ -12,7 +12,7 @@ from ..utils import get_artifact
 
 class TestDumpsysAppopsArtifact:
     def test_parsing(self):
-        da = DumpsysAppops()
+        da = DumpsysAppopsArtifact()
         da.log = logging
         file = get_artifact("android_data/dumpsys_appops.txt")
         with open(file) as f:
@@ -31,7 +31,7 @@ class TestDumpsysAppopsArtifact:
         assert len(da.results[11]["permissions"]) == 4
 
     def test_ioc_check(self, indicator_file):
-        da = DumpsysAppops()
+        da = DumpsysAppopsArtifact()
         da.log = logging
         file = get_artifact("android_data/dumpsys_appops.txt")
         with open(file) as f:
diff --git a/tests/android/test_artifact_dumpsys_dbinfo.py b/tests/android/test_artifact_dumpsys_dbinfo.py
index f0398a5..47eb73f 100644
--- a/tests/android/test_artifact_dumpsys_dbinfo.py
+++ b/tests/android/test_artifact_dumpsys_dbinfo.py
@@ -4,7 +4,7 @@
 #   https://license.mvt.re/1.1/
 import logging
 
-from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfo
+from mvt.android.artifacts.dumpsys_dbinfo import DumpsysDBInfoArtifact
 from mvt.common.indicators import Indicators
 
 from ..utils import get_artifact
@@ -12,7 +12,7 @@ from ..utils import get_artifact
 
 class TestDumpsysDBinfoArtifact:
     def test_parsing(self):
-        dbi = DumpsysDBInfo()
+        dbi = DumpsysDBInfoArtifact()
         file = get_artifact("android_data/dumpsys_dbinfo.txt")
         with open(file) as f:
             data = f.read()
@@ -27,7 +27,7 @@ class TestDumpsysDBinfoArtifact:
         )
 
     def test_ioc_check(self, indicator_file):
-        dbi = DumpsysDBInfo()
+        dbi = DumpsysDBInfoArtifact()
         file = get_artifact("android_data/dumpsys_dbinfo.txt")
         with open(file) as f:
             data = f.read()
diff --git a/tests/android/test_artifact_dumpsys_package_activities.py b/tests/android/test_artifact_dumpsys_package_activities.py
index 473f28f..af6b9a4 100644
--- a/tests/android/test_artifact_dumpsys_package_activities.py
+++ b/tests/android/test_artifact_dumpsys_package_activities.py
@@ -4,7 +4,9 @@
 #   https://license.mvt.re/1.1/
 import logging
 
-from mvt.android.artifacts.dumpsys_package_activities import DumpsysPackageActivities
+from mvt.android.artifacts.dumpsys_package_activities import (
+    DumpsysPackageActivitiesArtifact,
+)
 from mvt.common.indicators import Indicators
 
 from ..utils import get_artifact
@@ -12,7 +14,7 @@ from ..utils import get_artifact
 
 class TestDumpsysPackageActivitiesArtifact:
     def test_parsing(self):
-        dpa = DumpsysPackageActivities()
+        dpa = DumpsysPackageActivitiesArtifact()
         file = get_artifact("android_data/dumpsys_packages.txt")
         with open(file) as f:
             data = f.read()
@@ -27,7 +29,7 @@ class TestDumpsysPackageActivitiesArtifact:
         )
 
     def test_ioc_check(self, indicator_file):
-        dpa = DumpsysPackageActivities()
+        dpa = DumpsysPackageActivitiesArtifact()
         file = get_artifact("android_data/dumpsys_packages.txt")
         with open(file) as f:
             data = f.read()