diff --git a/Cargo.lock b/Cargo.lock
index 0fc37f91..620f675b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1180,7 +1180,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "witcherscript-analyzer"
+name = "witcherscript-analysis"
 version = "0.1.0"
 dependencies = [
  "lsp-types",
@@ -1198,7 +1198,7 @@ dependencies = [
  "tokio",
  "tower-lsp",
  "witcherscript",
- "witcherscript-analyzer",
+ "witcherscript-analysis",
  "witcherscript-project",
 ]
 
diff --git a/crates/analyzer/Cargo.toml b/crates/analysis/Cargo.toml
similarity index 90%
rename from crates/analyzer/Cargo.toml
rename to crates/analysis/Cargo.toml
index 1cab9003..936e378c 100644
--- a/crates/analyzer/Cargo.toml
+++ b/crates/analysis/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "witcherscript-analyzer"
+name = "witcherscript-analysis"
 description = "WitcherScript semantic analysis toolset"
 version.workspace = true
 edition.workspace = true
diff --git a/crates/analyzer/src/diagnostics/diagnostic.rs b/crates/analysis/src/diagnostics/diagnostic.rs
similarity index 100%
rename from crates/analyzer/src/diagnostics/diagnostic.rs
rename to crates/analysis/src/diagnostics/diagnostic.rs
diff --git a/crates/analyzer/src/diagnostics/errors.rs b/crates/analysis/src/diagnostics/errors.rs
similarity index 100%
rename from crates/analyzer/src/diagnostics/errors.rs
rename to crates/analysis/src/diagnostics/errors.rs
diff --git a/crates/analyzer/src/diagnostics/infos.rs b/crates/analysis/src/diagnostics/infos.rs
similarity index 100%
rename from crates/analyzer/src/diagnostics/infos.rs
rename to crates/analysis/src/diagnostics/infos.rs
diff --git a/crates/analyzer/src/diagnostics/mod.rs b/crates/analysis/src/diagnostics/mod.rs
similarity index 100%
rename from crates/analyzer/src/diagnostics/mod.rs
rename to crates/analysis/src/diagnostics/mod.rs
diff --git a/crates/analyzer/src/diagnostics/warnings.rs b/crates/analysis/src/diagnostics/warnings.rs
similarity index 100%
rename from crates/analyzer/src/diagnostics/warnings.rs
rename to crates/analysis/src/diagnostics/warnings.rs
diff --git a/crates/analyzer/src/jobs/inject_native_symbols.rs b/crates/analysis/src/jobs/inject_native_symbols.rs
similarity index 100%
rename from crates/analyzer/src/jobs/inject_native_symbols.rs
rename to crates/analysis/src/jobs/inject_native_symbols.rs
diff --git a/crates/analyzer/src/jobs/mod.rs b/crates/analysis/src/jobs/mod.rs
similarity index 100%
rename from crates/analyzer/src/jobs/mod.rs
rename to crates/analysis/src/jobs/mod.rs
diff --git a/crates/analyzer/src/jobs/scan_symbols.rs b/crates/analysis/src/jobs/scan_symbols.rs
similarity index 100%
rename from crates/analyzer/src/jobs/scan_symbols.rs
rename to crates/analysis/src/jobs/scan_symbols.rs
diff --git a/crates/analyzer/src/jobs/syntax_analysis/error_inference.rs b/crates/analysis/src/jobs/syntax_analysis/error_inference.rs
similarity index 100%
rename from crates/analyzer/src/jobs/syntax_analysis/error_inference.rs
rename to crates/analysis/src/jobs/syntax_analysis/error_inference.rs
diff --git a/crates/analyzer/src/jobs/syntax_analysis/mod.rs b/crates/analysis/src/jobs/syntax_analysis/mod.rs
similarity index 100%
rename from crates/analyzer/src/jobs/syntax_analysis/mod.rs
rename to crates/analysis/src/jobs/syntax_analysis/mod.rs
diff --git a/crates/analyzer/src/jobs/syntax_analysis/syntax_error_visitor.rs b/crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
similarity index 100%
rename from crates/analyzer/src/jobs/syntax_analysis/syntax_error_visitor.rs
rename to crates/analysis/src/jobs/syntax_analysis/syntax_error_visitor.rs
diff --git a/crates/analyzer/src/lib.rs b/crates/analysis/src/lib.rs
similarity index 100%
rename from crates/analyzer/src/lib.rs
rename to crates/analysis/src/lib.rs
diff --git a/crates/analyzer/src/model/collections/mod.rs b/crates/analysis/src/model/collections/mod.rs
similarity index 100%
rename from crates/analyzer/src/model/collections/mod.rs
rename to crates/analysis/src/model/collections/mod.rs
diff --git a/crates/analyzer/src/model/collections/symbol_ctx.rs b/crates/analysis/src/model/collections/symbol_ctx.rs
similarity index 100%
rename from crates/analyzer/src/model/collections/symbol_ctx.rs
rename to crates/analysis/src/model/collections/symbol_ctx.rs
diff --git a/crates/analyzer/src/model/collections/symbol_table.rs b/crates/analysis/src/model/collections/symbol_table.rs
similarity index 100%
rename from crates/analyzer/src/model/collections/symbol_table.rs
rename to crates/analysis/src/model/collections/symbol_table.rs
diff --git a/crates/analyzer/src/model/mod.rs b/crates/analysis/src/model/mod.rs
similarity index 100%
rename from crates/analyzer/src/model/mod.rs
rename to crates/analysis/src/model/mod.rs
diff --git a/crates/analyzer/src/model/symbol_path.rs b/crates/analysis/src/model/symbol_path.rs
similarity index 100%
rename from crates/analyzer/src/model/symbol_path.rs
rename to crates/analysis/src/model/symbol_path.rs
diff --git a/crates/analyzer/src/model/symbol_variant.rs b/crates/analysis/src/model/symbol_variant.rs
similarity index 100%
rename from crates/analyzer/src/model/symbol_variant.rs
rename to crates/analysis/src/model/symbol_variant.rs
diff --git a/crates/analyzer/src/model/symbols/array_type_symbol.rs b/crates/analysis/src/model/symbols/array_type_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/array_type_symbol.rs
rename to crates/analysis/src/model/symbols/array_type_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/class_symbol.rs b/crates/analysis/src/model/symbols/class_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/class_symbol.rs
rename to crates/analysis/src/model/symbols/class_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/enum_symbol.rs b/crates/analysis/src/model/symbols/enum_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/enum_symbol.rs
rename to crates/analysis/src/model/symbols/enum_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/func_param_symbol.rs b/crates/analysis/src/model/symbols/func_param_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/func_param_symbol.rs
rename to crates/analysis/src/model/symbols/func_param_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/function_symbol.rs b/crates/analysis/src/model/symbols/function_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/function_symbol.rs
rename to crates/analysis/src/model/symbols/function_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/mod.rs b/crates/analysis/src/model/symbols/mod.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/mod.rs
rename to crates/analysis/src/model/symbols/mod.rs
diff --git a/crates/analyzer/src/model/symbols/paths.rs b/crates/analysis/src/model/symbols/paths.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/paths.rs
rename to crates/analysis/src/model/symbols/paths.rs
diff --git a/crates/analyzer/src/model/symbols/primitive_type_symbol.rs b/crates/analysis/src/model/symbols/primitive_type_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/primitive_type_symbol.rs
rename to crates/analysis/src/model/symbols/primitive_type_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/state_symbol.rs b/crates/analysis/src/model/symbols/state_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/state_symbol.rs
rename to crates/analysis/src/model/symbols/state_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/struct_symbol.rs b/crates/analysis/src/model/symbols/struct_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/struct_symbol.rs
rename to crates/analysis/src/model/symbols/struct_symbol.rs
diff --git a/crates/analyzer/src/model/symbols/symbol.rs b/crates/analysis/src/model/symbols/symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/symbol.rs
rename to crates/analysis/src/model/symbols/symbol.rs
diff --git a/crates/analyzer/src/model/symbols/var_symbol.rs b/crates/analysis/src/model/symbols/var_symbol.rs
similarity index 100%
rename from crates/analyzer/src/model/symbols/var_symbol.rs
rename to crates/analysis/src/model/symbols/var_symbol.rs
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index 04c71670..ea8e1209 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -7,7 +7,7 @@ authors.workspace = true
 
 [dependencies]
 witcherscript = { path = "../core" }
-witcherscript-analyzer = { path = "../analyzer" }
+witcherscript-analysis = { path = "../analysis" }
 witcherscript-project = { path = "../project" }
 dashmap.workspace = true
 tower-lsp = "0.20.0"
diff --git a/crates/lsp/src/providers/document_sync.rs b/crates/lsp/src/providers/document_sync.rs
index ae2e9984..7f688e80 100644
--- a/crates/lsp/src/providers/document_sync.rs
+++ b/crates/lsp/src/providers/document_sync.rs
@@ -1,7 +1,7 @@
 use std::{ops::DerefMut, borrow::Borrow};
 use tower_lsp::lsp_types as lsp;
 use witcherscript::{script_document::ScriptDocument, Script};
-use witcherscript_analyzer::{diagnostics::{Diagnostic, DiagnosticBody}, jobs::syntax_analysis};
+use witcherscript_analysis::{diagnostics::{Diagnostic, DiagnosticBody}, jobs::syntax_analysis};
 use crate::Backend;