diff --git a/Cargo.toml b/Cargo.toml
index 3044851..186d4f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,9 @@ members = [
 	"dcb-pak",
 	"dcb-tools/dcb-extractor",
 	"dcb-tools/dcb-decompiler",
-	"dcb-tools/undrv",
-	"dcb-tools/drv",
-	"dcb-tools/unpak",
+	"dcb-tools/dcb-undrv",
+	"dcb-tools/dcb-mkdrv",
+	"dcb-tools/dcb-unpak",
 	"dcb-tools/model-set-extractor",
 	"dcb-tools/dcb-iso2bin",
 	"dcb-tools/dcb-bin2iso",
diff --git a/dcb-tools/drv/Cargo.toml b/dcb-tools/dcb-mkdrv/Cargo.toml
similarity index 95%
rename from dcb-tools/drv/Cargo.toml
rename to dcb-tools/dcb-mkdrv/Cargo.toml
index a4ad861..cbe9584 100644
--- a/dcb-tools/drv/Cargo.toml
+++ b/dcb-tools/dcb-mkdrv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "drv"
+name = "dcb-mkdrv"
 version = "0.1.0"
 authors = ["Filipe Rodrigues <filipejacintorodrigues1@gmail.com>"]
 edition = "2018"
diff --git a/dcb-tools/drv/src/cli.rs b/dcb-tools/dcb-mkdrv/src/cli.rs
similarity index 100%
rename from dcb-tools/drv/src/cli.rs
rename to dcb-tools/dcb-mkdrv/src/cli.rs
diff --git a/dcb-tools/drv/src/dir_lister.rs b/dcb-tools/dcb-mkdrv/src/dir_lister.rs
similarity index 100%
rename from dcb-tools/drv/src/dir_lister.rs
rename to dcb-tools/dcb-mkdrv/src/dir_lister.rs
diff --git a/dcb-tools/drv/src/dir_lister/error.rs b/dcb-tools/dcb-mkdrv/src/dir_lister/error.rs
similarity index 100%
rename from dcb-tools/drv/src/dir_lister/error.rs
rename to dcb-tools/dcb-mkdrv/src/dir_lister/error.rs
diff --git a/dcb-tools/drv/src/main.rs b/dcb-tools/dcb-mkdrv/src/main.rs
similarity index 100%
rename from dcb-tools/drv/src/main.rs
rename to dcb-tools/dcb-mkdrv/src/main.rs
diff --git a/dcb-tools/undrv/Cargo.toml b/dcb-tools/dcb-undrv/Cargo.toml
similarity index 95%
rename from dcb-tools/undrv/Cargo.toml
rename to dcb-tools/dcb-undrv/Cargo.toml
index 2cc507b..749c8fa 100644
--- a/dcb-tools/undrv/Cargo.toml
+++ b/dcb-tools/dcb-undrv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "undrv"
+name = "dcb-undrv"
 version = "0.1.0"
 authors = ["Filipe Rodrigues <filipejacintorodrigues1@gmail.com>"]
 edition = "2018"
diff --git a/dcb-tools/undrv/src/cli.rs b/dcb-tools/dcb-undrv/src/cli.rs
similarity index 100%
rename from dcb-tools/undrv/src/cli.rs
rename to dcb-tools/dcb-undrv/src/cli.rs
diff --git a/dcb-tools/undrv/src/main.rs b/dcb-tools/dcb-undrv/src/main.rs
similarity index 100%
rename from dcb-tools/undrv/src/main.rs
rename to dcb-tools/dcb-undrv/src/main.rs
diff --git a/dcb-tools/unpak/Cargo.toml b/dcb-tools/dcb-unpak/Cargo.toml
similarity index 88%
rename from dcb-tools/unpak/Cargo.toml
rename to dcb-tools/dcb-unpak/Cargo.toml
index 4d80d4d..abefc48 100644
--- a/dcb-tools/unpak/Cargo.toml
+++ b/dcb-tools/dcb-unpak/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "unpak"
+name = "dcb-unpak"
 version = "0.1.0"
 authors = ["Filipe Rodrigues <filipejacintorodrigues1@gmail.com>"]
 edition = "2018"
diff --git a/dcb-tools/unpak/src/cli.rs b/dcb-tools/dcb-unpak/src/cli.rs
similarity index 100%
rename from dcb-tools/unpak/src/cli.rs
rename to dcb-tools/dcb-unpak/src/cli.rs
diff --git a/dcb-tools/unpak/src/main.rs b/dcb-tools/dcb-unpak/src/main.rs
similarity index 100%
rename from dcb-tools/unpak/src/main.rs
rename to dcb-tools/dcb-unpak/src/main.rs