diff --git a/dev-libs/treesitter/treesitter-0.20.6.recipe b/dev-libs/tree-sitter/tree_sitter-0.20.6.recipe
similarity index 88%
rename from dev-libs/treesitter/treesitter-0.20.6.recipe
rename to dev-libs/tree-sitter/tree_sitter-0.20.6.recipe
index b821c8d96..58a07c7fc 100644
--- a/dev-libs/treesitter/treesitter-0.20.6.recipe
+++ b/dev-libs/tree-sitter/tree_sitter-0.20.6.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Tree-sitter is an extendable parsing system for various programming
 HOMEPAGE="https://tree-sitter.github.io/"
 COPYRIGHT="2018-2021 Max Brunsfeld"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de"
 SOURCE_DIR="tree-sitter-$portVersion"
@@ -12,7 +12,7 @@ ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	treesitter$secondaryArchSuffix = $portVersion
+	tree_sitter$secondaryArchSuffix = $portVersion
 	lib:libtree_sitter$secondaryArchSuffix = $portVersion compat >= 1.0
 	cmd:tree_sitter
 	"
@@ -21,11 +21,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	treesitter${secondaryArchSuffix}_devel
+	tree_sitter${secondaryArchSuffix}_devel
 	devel:libtree_sitter$secondaryArchSuffix
 	"
 REQUIRES_devel="
-	treesitter$secondaryArchSuffix == $portVersion base
+	tree_sitter$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
diff --git a/dev-util/tree-sitter/tree_sitter-0.20.0.recipe b/dev-util/tree-sitter/tree_sitter-0.20.0.recipe
deleted file mode 100644
index d87af9c2c..000000000
--- a/dev-util/tree-sitter/tree_sitter-0.20.0.recipe
+++ /dev/null
@@ -1,68 +0,0 @@
-SUMMARY="A parser generator tool and an incremental parsing library"
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental \
-parsing library.
-It can build a concrete syntax tree for a source file and efficiently update \
-the syntax tree as the source file is edited."
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-COPYRIGHT="2018 Max Brunsfeld"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="4a8070b9de17c3b8096181fe8530320ab3e8cca685d8bee6a3e8d164b5fb47da"
-SOURCE_FILENAME="tree-sitter-v$portVersion.tar.gz"
-SOURCE_DIR="tree-sitter-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	tree_sitter$secondaryArchSuffix = $portVersion
-	cmd:tree_sitter = $portVersion
-	lib:libtree_sitter$secondaryArchSuffix = 0.0 compat >= 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	tree_sitter${secondaryArchSuffix}_devel = $portVersion
-	devel:libtree_sitter$secondaryArchSuffix = 0.0 compat >= 0
-	"
-REQUIRES_devel="
-	tree_sitter$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cargo$secondaryArchSuffix
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	cargo fetch --locked
-	make PREFIX=$prefix \
-		INCLUDEDIR=$includeDir \
-		LIBDIR=$libDir $jobArgs
-	cd cli
-	cargo build --release --locked --offline --all-features
-}
-
-INSTALL()
-{
-	make PREFIX=$prefix \
-		INCLUDEDIR=$includeDir \
-		LIBDIR=$libDir install
-
-	mkdir -p $prefix/bin
-	cp target/release/tree-sitter $prefix/bin
-
-	prepareInstalledDevelLib libtree-sitter
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir
-}