diff --git a/libs/sqf/src/analyze/lints/s12_invalid_args.rs b/libs/sqf/src/analyze/lints/s12_invalid_args.rs
index acff86ac..7041b592 100644
--- a/libs/sqf/src/analyze/lints/s12_invalid_args.rs
+++ b/libs/sqf/src/analyze/lints/s12_invalid_args.rs
@@ -1,5 +1,5 @@
 use crate::{
-    analyze::{inspector::Issue, SqfLintData},
+    analyze::{inspector::Issue, LintData},
     Statements,
 };
 use hemtt_common::config::LintConfig;
@@ -11,7 +11,7 @@ use std::{ops::Range, sync::Arc};
 
 crate::analyze::lint!(LintS12InvalidArgs);
 
-impl Lint<SqfLintData> for LintS12InvalidArgs {
+impl Lint<LintData> for LintS12InvalidArgs {
     fn ident(&self) -> &'static str {
         "invalid_args"
     }
@@ -36,13 +36,13 @@ Checks correct syntax usage."
     fn default_config(&self) -> LintConfig {
         LintConfig::help()
     }
-    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<SqfLintData>>> {
+    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<LintData>>> {
         vec![Box::new(Runner)]
     }
 }
 
 pub struct Runner;
-impl LintRunner<SqfLintData> for Runner {
+impl LintRunner<LintData> for Runner {
     type Target = Statements;
     fn run(
         &self,
@@ -50,7 +50,7 @@ impl LintRunner<SqfLintData> for Runner {
         config: &hemtt_common::config::LintConfig,
         processed: Option<&hemtt_workspace::reporting::Processed>,
         target: &Statements,
-        _data: &SqfLintData,
+        _data: &LintData,
     ) -> hemtt_workspace::reporting::Codes {
         if target.issues().is_empty() {
             return Vec::new();
diff --git a/libs/sqf/src/analyze/lints/s13_undefined.rs b/libs/sqf/src/analyze/lints/s13_undefined.rs
index 9ee4691e..ca531b9d 100644
--- a/libs/sqf/src/analyze/lints/s13_undefined.rs
+++ b/libs/sqf/src/analyze/lints/s13_undefined.rs
@@ -1,5 +1,5 @@
 use crate::{
-    analyze::{inspector::Issue, SqfLintData},
+    analyze::{inspector::Issue, LintData},
     Statements,
 };
 use hemtt_common::config::LintConfig;
@@ -11,7 +11,7 @@ use std::{ops::Range, sync::Arc};
 
 crate::analyze::lint!(LintS13Undefined);
 
-impl Lint<SqfLintData> for LintS13Undefined {
+impl Lint<LintData> for LintS13Undefined {
     fn ident(&self) -> &'static str {
         "undefined"
     }
@@ -36,13 +36,13 @@ Checks correct syntax usage."
     fn default_config(&self) -> LintConfig {
         LintConfig::help()
     }
-    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<SqfLintData>>> {
+    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<LintData>>> {
         vec![Box::new(Runner)]
     }
 }
 
 pub struct Runner;
-impl LintRunner<SqfLintData> for Runner {
+impl LintRunner<LintData> for Runner {
     type Target = Statements;
     fn run(
         &self,
@@ -50,7 +50,7 @@ impl LintRunner<SqfLintData> for Runner {
         config: &hemtt_common::config::LintConfig,
         processed: Option<&hemtt_workspace::reporting::Processed>,
         target: &Statements,
-        _data: &SqfLintData,
+        _data: &LintData,
     ) -> hemtt_workspace::reporting::Codes {
         if target.issues().is_empty() {
             return Vec::new();
diff --git a/libs/sqf/src/analyze/lints/s14_unused.rs b/libs/sqf/src/analyze/lints/s14_unused.rs
index 269d67af..9a17be1e 100644
--- a/libs/sqf/src/analyze/lints/s14_unused.rs
+++ b/libs/sqf/src/analyze/lints/s14_unused.rs
@@ -1,7 +1,7 @@
 use crate::{
     analyze::{
         inspector::{Issue, VarSource},
-        SqfLintData,
+        LintData,
     },
     Statements,
 };
@@ -14,7 +14,7 @@ use std::{ops::Range, sync::Arc};
 
 crate::analyze::lint!(LintS14Unused);
 
-impl Lint<SqfLintData> for LintS14Unused {
+impl Lint<LintData> for LintS14Unused {
     fn ident(&self) -> &'static str {
         "unused"
     }
@@ -39,13 +39,13 @@ Checks for vars that are never used."
     fn default_config(&self) -> LintConfig {
         LintConfig::help().with_enabled(false)
     }
-    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<SqfLintData>>> {
+    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<LintData>>> {
         vec![Box::new(Runner)]
     }
 }
 
 pub struct Runner;
-impl LintRunner<SqfLintData> for Runner {
+impl LintRunner<LintData> for Runner {
     type Target = Statements;
     fn run(
         &self,
@@ -53,7 +53,7 @@ impl LintRunner<SqfLintData> for Runner {
         config: &hemtt_common::config::LintConfig,
         processed: Option<&hemtt_workspace::reporting::Processed>,
         target: &Statements,
-        _data: &SqfLintData,
+        _data: &LintData,
     ) -> hemtt_workspace::reporting::Codes {
         if target.issues().is_empty() {
             return Vec::new();
diff --git a/libs/sqf/src/analyze/lints/s15_shadowed.rs b/libs/sqf/src/analyze/lints/s15_shadowed.rs
index eb0b0388..d5370b0a 100644
--- a/libs/sqf/src/analyze/lints/s15_shadowed.rs
+++ b/libs/sqf/src/analyze/lints/s15_shadowed.rs
@@ -1,5 +1,5 @@
 use crate::{
-    analyze::{inspector::Issue, SqfLintData},
+    analyze::{inspector::Issue, LintData},
     Statements,
 };
 use hemtt_common::config::LintConfig;
@@ -11,7 +11,7 @@ use std::{ops::Range, sync::Arc};
 
 crate::analyze::lint!(LintS15Shadowed);
 
-impl Lint<SqfLintData> for LintS15Shadowed {
+impl Lint<LintData> for LintS15Shadowed {
     fn ident(&self) -> &'static str {
         "shadowed"
     }
@@ -37,13 +37,13 @@ Checks for variables being shadowed."
     fn default_config(&self) -> LintConfig {
         LintConfig::help().with_enabled(false)
     }
-    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<SqfLintData>>> {
+    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<LintData>>> {
         vec![Box::new(Runner)]
     }
 }
 
 pub struct Runner;
-impl LintRunner<SqfLintData> for Runner {
+impl LintRunner<LintData> for Runner {
     type Target = Statements;
     fn run(
         &self,
@@ -51,7 +51,7 @@ impl LintRunner<SqfLintData> for Runner {
         config: &hemtt_common::config::LintConfig,
         processed: Option<&hemtt_workspace::reporting::Processed>,
         target: &Statements,
-        _data: &SqfLintData,
+        _data: &LintData,
     ) -> hemtt_workspace::reporting::Codes {
         if target.issues().is_empty() {
             return Vec::new();
diff --git a/libs/sqf/src/analyze/lints/s16_not_private.rs b/libs/sqf/src/analyze/lints/s16_not_private.rs
index 58fab197..2e83481e 100644
--- a/libs/sqf/src/analyze/lints/s16_not_private.rs
+++ b/libs/sqf/src/analyze/lints/s16_not_private.rs
@@ -1,5 +1,5 @@
 use crate::{
-    analyze::{inspector::Issue, SqfLintData},
+    analyze::{inspector::Issue, LintData},
     Statements,
 };
 use hemtt_common::config::LintConfig;
@@ -11,7 +11,7 @@ use std::{ops::Range, sync::Arc};
 
 crate::analyze::lint!(LintS16NotPrivate);
 
-impl Lint<SqfLintData> for LintS16NotPrivate {
+impl Lint<LintData> for LintS16NotPrivate {
     fn ident(&self) -> &'static str {
         "not_private"
     }
@@ -36,13 +36,13 @@ Checks local variables that are not private."
     fn default_config(&self) -> LintConfig {
         LintConfig::help().with_enabled(false)
     }
-    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<SqfLintData>>> {
+    fn runners(&self) -> Vec<Box<dyn AnyLintRunner<LintData>>> {
         vec![Box::new(Runner)]
     }
 }
 
 pub struct Runner;
-impl LintRunner<SqfLintData> for Runner {
+impl LintRunner<LintData> for Runner {
     type Target = Statements;
     fn run(
         &self,
@@ -50,7 +50,7 @@ impl LintRunner<SqfLintData> for Runner {
         config: &hemtt_common::config::LintConfig,
         processed: Option<&hemtt_workspace::reporting::Processed>,
         target: &Statements,
-        _data: &SqfLintData,
+        _data: &LintData,
     ) -> hemtt_workspace::reporting::Codes {
         if target.issues().is_empty() {
             return Vec::new();