diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile
index b39e4073..2d80c6f4 100644
--- a/examples/PoolBox/assets/Makefile
+++ b/examples/PoolBox/assets/Makefile
@@ -41,23 +41,23 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
 
 $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv $< -o $@ xa
+	psxfileconv $< -o $@ xa
 
 $(OUTPUT_DIR)/%.vag: audio/temp/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ vag
+	psxfileconv --lz4 $< -o $@ vag
 
 $(OUTPUT_DIR)/%.vag2: audio/temp/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ my-vag
+	psxfileconv --lz4 $< -o $@ my-vag
 
 $(OUTPUT_DIR)/%.xa: audio/%.wav
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv $< -o $@ xa
+	psxfileconv $< -o $@ xa
 
 $(OUTPUT_DIR)/%.img: %.png
 	@mkdir -p $(OUTPUT_DIR)
-	fileconv --lz4 $< -o $@ $($*_FLAGS)
+	psxfileconv --lz4 $< -o $@ $($*_FLAGS)
 
 all: $(INPUT)
 
diff --git a/src/Library/Makefile b/src/Library/Makefile
index bc574b48..ca0fc3d6 100644
--- a/src/Library/Makefile
+++ b/src/Library/Makefile
@@ -36,10 +36,10 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
 # TODO: Improve later
 # rule to make the boot image
 $(SPLASH_IMAGE): ressources/Splash.png
-	fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
+	psxfileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
 
 $(SPLASH_IMAGE_NTSC): ressources/Splash_ntsc.png
-	fileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
+	psxfileconv --lz4 $< simple-tim full16 | cpp_out --name SplashScreen -o $@	
 
 #Rules section for default compilation and linking
 all: $(SPLASH_IMAGE) $(SPLASH_IMAGE_NTSC) $(LIB_DIR)/$(ARTIFACT).a 
diff --git a/src/Tools/Makefile b/src/Tools/Makefile
index ab05f31e..15bf69db 100644
--- a/src/Tools/Makefile
+++ b/src/Tools/Makefile
@@ -1,4 +1,4 @@
-PROJECTS = cpp_out fileconv mkoverlay psxcdgen_ex psxreadmap wslpath
+PROJECTS = cpp_out psxfileconv mkoverlay psxcdgen_ex psxreadmap wslpath
 .PHONY: $(PROJECTS)
 
 $(foreach var,$(PROJECTS),$(var)):
diff --git a/src/Tools/Tests/Test.mk b/src/Tools/Tests/Test.mk
index 1a5b4f5a..bdcd7e36 100644
--- a/src/Tools/Tests/Test.mk
+++ b/src/Tools/Tests/Test.mk
@@ -4,7 +4,7 @@ test_cpp_out: always
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.cpp"
 	@echo "Planschbecken" | ./../cpp_out/target/x86_64-unknown-linux-gnu/release/cpp_out --name Dino -o "Test_Planschbecken.hpp"
 
-test_fileconv: always
-#	@./../fileconv/target/x86_64-unknown-linux-musl/release/fileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
-	@./../fileconv/target/x86_64-unknown-linux-gnu/release/fileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
+test_psxfileconv: always
+#	@./../psxfileconv/target/x86_64-unknown-linux-musl/release/psxfileconv -o Test_Planschi.bin Test_PNG.PNG simple-tim full16
+	@./../psxfileconv/target/x86_64-unknown-linux-gnu/release/psxfileconv --lz4 -o Test_Planschi.bin ../../Library/ressources/Splash.PNG simple-tim full16
 always: ;
\ No newline at end of file
diff --git a/src/Tools/Tools.code-workspace b/src/Tools/Tools.code-workspace
index a14b2e5f..d0dee0ff 100644
--- a/src/Tools/Tools.code-workspace
+++ b/src/Tools/Tools.code-workspace
@@ -8,19 +8,19 @@
         "cargo_task": [
             "./ all!Unix: All",
             "cpp_out all!Unix: cpp_out",
-            "fileconv all!Unix: fileconv",
             "mkoverlay all!Unix: mkoverlay",
             "psxcdgen_ex all!Unix: psxcdgen_ex",
             "psxcdread all!Unix: psxcdread",
+            "psxfileconv all!Unix: psxfileconv",
             "psxreadmap all!Unix: psxreadmap",
             "wslpath all!Unix: wslpath",
 
             "./ all-windows!Windows: All",
             "cpp_out all-windows!Windows: cpp_out",
-            "fileconv all-windows!Windows: fileconv",
             "mkoverlay all-windows!Windows: mkoverlay",
             "psxcdgen_ex all-windows!Windows: psxcdgen_ex",
             "psxcdread all-windows!Windows: psxcdread",
+            "psxfileconv all-windows!Windows: psxfileconv",
             "psxreadmap all-windows!Windows: psxreadmap",
             "wslpath all-windows!Windows: wslpath"
         ]
diff --git a/src/Tools/fileconv/Cargo.toml b/src/Tools/psxfileconv/Cargo.toml
similarity index 76%
rename from src/Tools/fileconv/Cargo.toml
rename to src/Tools/psxfileconv/Cargo.toml
index 3d64a806..ddef77de 100644
--- a/src/Tools/fileconv/Cargo.toml
+++ b/src/Tools/psxfileconv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "fileconv"
+name = "psxfileconv"
 version = "0.5.0"
 edition = "2021"
 
diff --git a/src/Tools/fileconv/Makefile b/src/Tools/psxfileconv/Makefile
similarity index 78%
rename from src/Tools/fileconv/Makefile
rename to src/Tools/psxfileconv/Makefile
index b4ba059d..8f91f632 100644
--- a/src/Tools/fileconv/Makefile
+++ b/src/Tools/psxfileconv/Makefile
@@ -1,6 +1,6 @@
 include ../Common.mk
 
-ARTIFACT = fileconv
+ARTIFACT = psxfileconv
 
 .PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
 $(WINDOWS_ARTIFACT):
diff --git a/src/Tools/fileconv/src/audio/mod.rs b/src/Tools/psxfileconv/src/audio/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/audio/mod.rs
rename to src/Tools/psxfileconv/src/audio/mod.rs
diff --git a/src/Tools/fileconv/src/audio/my_vag/mod.rs b/src/Tools/psxfileconv/src/audio/my_vag/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/audio/my_vag/mod.rs
rename to src/Tools/psxfileconv/src/audio/my_vag/mod.rs
diff --git a/src/Tools/fileconv/src/audio/my_vag/types.rs b/src/Tools/psxfileconv/src/audio/my_vag/types.rs
similarity index 100%
rename from src/Tools/fileconv/src/audio/my_vag/types.rs
rename to src/Tools/psxfileconv/src/audio/my_vag/types.rs
diff --git a/src/Tools/fileconv/src/audio/vag/mod.rs b/src/Tools/psxfileconv/src/audio/vag/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/audio/vag/mod.rs
rename to src/Tools/psxfileconv/src/audio/vag/mod.rs
diff --git a/src/Tools/fileconv/src/audio/xa/mod.rs b/src/Tools/psxfileconv/src/audio/xa/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/audio/xa/mod.rs
rename to src/Tools/psxfileconv/src/audio/xa/mod.rs
diff --git a/src/Tools/fileconv/src/images/mod.rs b/src/Tools/psxfileconv/src/images/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/images/mod.rs
rename to src/Tools/psxfileconv/src/images/mod.rs
diff --git a/src/Tools/fileconv/src/images/reduced_tim/color_clut.rs b/src/Tools/psxfileconv/src/images/reduced_tim/color_clut.rs
similarity index 100%
rename from src/Tools/fileconv/src/images/reduced_tim/color_clut.rs
rename to src/Tools/psxfileconv/src/images/reduced_tim/color_clut.rs
diff --git a/src/Tools/fileconv/src/images/reduced_tim/color_full16.rs b/src/Tools/psxfileconv/src/images/reduced_tim/color_full16.rs
similarity index 100%
rename from src/Tools/fileconv/src/images/reduced_tim/color_full16.rs
rename to src/Tools/psxfileconv/src/images/reduced_tim/color_full16.rs
diff --git a/src/Tools/fileconv/src/images/reduced_tim/mod.rs b/src/Tools/psxfileconv/src/images/reduced_tim/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/images/reduced_tim/mod.rs
rename to src/Tools/psxfileconv/src/images/reduced_tim/mod.rs
diff --git a/src/Tools/fileconv/src/images/reduced_tim/types.rs b/src/Tools/psxfileconv/src/images/reduced_tim/types.rs
similarity index 100%
rename from src/Tools/fileconv/src/images/reduced_tim/types.rs
rename to src/Tools/psxfileconv/src/images/reduced_tim/types.rs
diff --git a/src/Tools/fileconv/src/lib.rs b/src/Tools/psxfileconv/src/lib.rs
similarity index 100%
rename from src/Tools/fileconv/src/lib.rs
rename to src/Tools/psxfileconv/src/lib.rs
diff --git a/src/Tools/fileconv/src/main.rs b/src/Tools/psxfileconv/src/main.rs
similarity index 98%
rename from src/Tools/fileconv/src/main.rs
rename to src/Tools/psxfileconv/src/main.rs
index 5aee4da1..6b0fa647 100644
--- a/src/Tools/fileconv/src/main.rs
+++ b/src/Tools/psxfileconv/src/main.rs
@@ -1,5 +1,5 @@
 use clap::{Parser, Subcommand};
-use fileconv::{audio::{self, *}, images::*, nothing};
+use psxfileconv::{audio::{self, *}, images::*, nothing};
 use std::path::PathBuf;
 use tool_helper::{exit_with_error, print_warning, Error};
 
diff --git a/src/Tools/fileconv/src/nothing/mod.rs b/src/Tools/psxfileconv/src/nothing/mod.rs
similarity index 100%
rename from src/Tools/fileconv/src/nothing/mod.rs
rename to src/Tools/psxfileconv/src/nothing/mod.rs
diff --git a/support/src/FontWriter/Makefile b/support/src/FontWriter/Makefile
index 2b34f69f..af90a06e 100644
--- a/support/src/FontWriter/Makefile
+++ b/support/src/FontWriter/Makefile
@@ -21,7 +21,7 @@ LIB_OBJS = $(filter-out $(MAIN_BOOT_OBJ) $(OVERLAY_BOOT_OBJ),$(OBJS))
 #$(info $$var2 is [${LIB_OBJS}])
 
 $(DEFAULT_FONT_IMAGE): ressources/DefaultFont.png
-	fileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
+	psxfileconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
 
 #Linking rule
 $(TARGET).a: $(LIB_OBJS)
diff --git a/template/JabyEngine-PSX_Game/assets/Makefile b/template/JabyEngine-PSX_Game/assets/Makefile
index 341868c3..be24617f 100644
--- a/template/JabyEngine-PSX_Game/assets/Makefile
+++ b/template/JabyEngine-PSX_Game/assets/Makefile
@@ -6,7 +6,7 @@ OUTPUT_DIR = bin
 # Create build targets like
 # $(OUTPUT_DIR)/TexturePage.bin: TexturePage.png
 # @mkdir -p $(OUTPUT_DIR)
-# fileconv --lz4 $< -o $@ simple-tim clut4
+# psxfileconv --lz4 $< -o $@ simple-tim clut4
 
 all: #$(OUTPUT_DIR)/TexturePage.bin