diff --git a/Cargo.lock b/Cargo.lock
index 9f13197..3a7e949 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -219,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.11"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "jobserver",
  "libc",
@@ -981,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "ropey"
@@ -1417,18 +1417,26 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.22.6"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca"
+checksum = "20f4cd3642c47a85052a887d86704f4eac272969f61b686bdd3f772122aabaff"
 dependencies = [
  "cc",
  "regex",
+ "regex-syntax",
+ "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
+
 [[package]]
 name = "tree-sitter-witcherscript"
-version = "0.12.0"
-source = "git+https://github.com/SpontanCombust/tree-sitter-witcherscript.git?tag=v0.12.0#b9b9e45f2e3d2c1798c4b06567d66066cf0ee8d5"
+version = "0.13.0"
+source = "git+https://github.com/SpontanCombust/tree-sitter-witcherscript.git?tag=v0.13.0#978657fd9d075a89ec79588605dfc8bd74334346"
 dependencies = [
  "cc",
  "tree-sitter",
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
index a1d41e7..05ca20a 100644
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -18,4 +18,4 @@ encoding_rs_io = "0.1"
 
 [dependencies.tree-sitter-witcherscript]
 git = "https://github.com/SpontanCombust/tree-sitter-witcherscript.git"
-tag = "v0.12.0"
\ No newline at end of file
+tag = "v0.13.0"
\ No newline at end of file
diff --git a/crates/core/src/ast/functions.rs b/crates/core/src/ast/functions.rs
index 7467ecf..8c9afce 100644
--- a/crates/core/src/ast/functions.rs
+++ b/crates/core/src/ast/functions.rs
@@ -304,7 +304,7 @@ impl SyntaxNodeTraversal for FunctionDefinitionNode<'_> {
 pub type FunctionBlockNode<'script> = SyntaxNode<'script, tags::FunctionBlock>;
 
 impl NamedSyntaxNode for FunctionBlockNode<'_> {
-    const NODE_KIND: &'static str = "func_def";
+    const NODE_KIND: &'static str = "func_block";
 }
 
 impl<'script> FunctionBlockNode<'script> {
diff --git a/crates/core/src/ast/misc_stmts.rs b/crates/core/src/ast/misc_stmts.rs
index e892248..94dfaf4 100644
--- a/crates/core/src/ast/misc_stmts.rs
+++ b/crates/core/src/ast/misc_stmts.rs
@@ -254,7 +254,7 @@ impl SyntaxNodeTraversal for DeleteStatementNode<'_> {
 pub type CompoundStatementNode<'script> = SyntaxNode<'script, tags::CompoundStatement>;
 
 impl NamedSyntaxNode for CompoundStatementNode<'_> {
-    const NODE_KIND: &'static str = "compound_stmt";
+    const NODE_KIND: &'static str = "func_block";
 }
 
 impl<'script> CompoundStatementNode<'script> {
diff --git a/crates/core/src/ast/states.rs b/crates/core/src/ast/states.rs
index e593393..5f9b29a 100644
--- a/crates/core/src/ast/states.rs
+++ b/crates/core/src/ast/states.rs
@@ -96,7 +96,7 @@ impl SyntaxNodeTraversal for StateDeclarationNode<'_> {
 pub type StateBlockNode<'script> = SyntaxNode<'script, tags::StateBlock>;
 
 impl NamedSyntaxNode for StateBlockNode<'_> {
-    const NODE_KIND: &'static str = "state_def";
+    const NODE_KIND: &'static str = "class_def";
 }
 
 impl<'script> StateBlockNode<'script> {