diff --git a/headers/private/kernel/platform/openfirmware/openfirmware.h b/headers/private/kernel/platform/openfirmware/openfirmware.h
index 3fe2c30d84..e5ebf77ddd 100644
--- a/headers/private/kernel/platform/openfirmware/openfirmware.h
+++ b/headers/private/kernel/platform/openfirmware/openfirmware.h
@@ -16,9 +16,9 @@
 extern int gChosen;
 
 
-template<typename AddressSize>
+template<typename AddressType>
 struct of_region {
-	AddressSize base;
+	AddressType base;
 	uint32 size;
 };
 
diff --git a/src/system/boot/platform/openfirmware/Jamfile b/src/system/boot/platform/openfirmware/Jamfile
index 322ab3bea5..227df039bf 100644
--- a/src/system/boot/platform/openfirmware/Jamfile
+++ b/src/system/boot/platform/openfirmware/Jamfile
@@ -17,7 +17,7 @@ KernelMergeObject boot_platform_openfirmware.o :
 	network.cpp
 	real_time_clock.cpp
 	start.cpp
-	of_support.cpp
+	support.cpp
 	video.cpp
 
 	openfirmware.cpp
diff --git a/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp b/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
index 345a45e0cf..0d3e0d2810 100644
--- a/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
+++ b/src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
@@ -22,7 +22,7 @@
 #include <arch_mmu.h>
 #include <kernel.h>
 
-#include "of_support.h"
+#include "support.h"
 
 
 // set protection to WIMGNPP: -----PP
diff --git a/src/system/boot/platform/openfirmware/of_support.cpp b/src/system/boot/platform/openfirmware/support.cpp
similarity index 97%
rename from src/system/boot/platform/openfirmware/of_support.cpp
rename to src/system/boot/platform/openfirmware/support.cpp
index 6c6d033b88..9c9a101f1f 100644
--- a/src/system/boot/platform/openfirmware/of_support.cpp
+++ b/src/system/boot/platform/openfirmware/support.cpp
@@ -9,7 +9,7 @@
  */
 
 
-#include "of_support.h"
+#include "support.h"
 #include <platform/openfirmware/openfirmware.h>
 
 
diff --git a/src/system/boot/platform/openfirmware/of_support.h b/src/system/boot/platform/openfirmware/support.h
similarity index 88%
rename from src/system/boot/platform/openfirmware/of_support.h
rename to src/system/boot/platform/openfirmware/support.h
index d7e0c66d27..afdae7c48b 100644
--- a/src/system/boot/platform/openfirmware/of_support.h
+++ b/src/system/boot/platform/openfirmware/support.h
@@ -5,8 +5,8 @@
  * Authors:
  *      Alexander von Gluck, kallisti5@unixzen.com
  */
-#ifndef OF_SUPPORT_H
-#define OF_SUPPORT_H
+#ifndef SUPPORT_H
+#define SUPPORT_H
 
 
 #include <OS.h>