diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile
index b86658440e..1322cb941f 100644
--- a/src/add-ons/kernel/drivers/network/Jamfile
+++ b/src/add-ons/kernel/drivers/network/Jamfile
@@ -8,7 +8,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network rtl8139 ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network rtl8169 ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network sis900 ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network stack ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network via-rhine ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network vlance ;
 SubInclude HAIKU_TOP src add-ons kernel drivers network wb840 ;
 
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/Jamfile b/src/add-ons/kernel/drivers/network/via-rhine/Jamfile
deleted file mode 100644
index 79e5140023..0000000000
--- a/src/add-ons/kernel/drivers/network/via-rhine/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network via-rhine ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network via-rhine dev ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network via-rhine pci ;
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/Jamfile b/src/add-ons/kernel/drivers/network/via-rhine/dev/Jamfile
deleted file mode 100644
index d50f5e27f6..0000000000
--- a/src/add-ons/kernel/drivers/network/via-rhine/dev/Jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network via-rhine dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network via-rhine dev mii ;
diff --git a/src/add-ons/kernel/drivers/network/via_rhine/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/Jamfile
new file mode 100644
index 0000000000..cbca5968b1
--- /dev/null
+++ b/src/add-ons/kernel/drivers/network/via_rhine/Jamfile
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine ;
+
+SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine dev ;
+SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine pci ;
diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/dev/Jamfile
new file mode 100644
index 0000000000..d3e5841103
--- /dev/null
+++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine dev ;
+
+SubInclude HAIKU_TOP src add-ons kernel drivers network via_rhine dev mii ;
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
similarity index 82%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/Jamfile
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
index a21dbecf25..488e753acb 100644
--- a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/Jamfile
+++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network via-rhine dev mii ;
+SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine dev mii ;
 
 UsePrivateHeaders kernel net ;
 
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ciphy.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ciphy.c
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphy.c
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ciphyreg.h b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ciphyreg.h
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ciphyreg.h
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/miidevs.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/miidevs.h
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/miidevs.h
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ukphy.c
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy.c
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/dev/mii/ukphy_subr.c
rename to src/add-ons/kernel/drivers/network/via_rhine/dev/mii/ukphy_subr.c
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/pci/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile
similarity index 83%
rename from src/add-ons/kernel/drivers/network/via-rhine/pci/Jamfile
rename to src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile
index 7b1b8735e1..a31861b452 100644
--- a/src/add-ons/kernel/drivers/network/via-rhine/pci/Jamfile
+++ b/src/add-ons/kernel/drivers/network/via_rhine/pci/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network via-rhine pci ;
+SubDir HAIKU_TOP src add-ons kernel drivers network via_rhine pci ;
 
 SubDirCcFlags -Wall ;
 
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/pci/glue.c b/src/add-ons/kernel/drivers/network/via_rhine/pci/glue.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/pci/glue.c
rename to src/add-ons/kernel/drivers/network/via_rhine/pci/glue.c
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/pci/if_vr.c b/src/add-ons/kernel/drivers/network/via_rhine/pci/if_vr.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/pci/if_vr.c
rename to src/add-ons/kernel/drivers/network/via_rhine/pci/if_vr.c
diff --git a/src/add-ons/kernel/drivers/network/via-rhine/pci/if_vrreg.h b/src/add-ons/kernel/drivers/network/via_rhine/pci/if_vrreg.h
similarity index 100%
rename from src/add-ons/kernel/drivers/network/via-rhine/pci/if_vrreg.h
rename to src/add-ons/kernel/drivers/network/via_rhine/pci/if_vrreg.h