11 files changed, 15 insertions, 15 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index aa2c19c..2fc9e02 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -5,7 +5,7 @@
 SUBDIR+=		ficl
 .endif
 
-# Build OpenFirmware library.
+# Build Open Firmware library.
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
 SUBDIR+=		ofw
 .endif
diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c
index 23850eb..2fdd293 100644
--- a/sys/boot/ofw/common/main.c
+++ b/sys/boot/ofw/common/main.c
@@ -102,7 +102,7 @@ main(int (*openfirm)(void *))
 	char		**bargv;
 
 	/*
-	 * Initalise the OpenFirmware routines by giving them the entry point.
+	 * Initalise the Open Firmware routines by giving them the entry point.
 	 */
 	OF_init(openfirm);
 
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index d10a8c2..a0c9f02 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -47,7 +47,7 @@ static ihandle_t stdout;
 
 struct console ofwconsole = {
 	"ofw",
-	"OpenFirmware console",
+	"Open Firmware console",
 	0,
 	ofw_cons_probe,
 	ofw_cons_init,
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/sys/boot/ofw/libofw/ofw_net.c
index 14f02ab..cb85eea 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/sys/boot/ofw/libofw/ofw_net.c
@@ -207,7 +207,7 @@ ofwn_init(struct iodesc *desc, void *machdep_hint)
 	}
 
 #if defined(NETIF_DEBUG)
-	printf("ofwn_init: OpenFirmware instance handle: %08x\n", netinstance);
+	printf("ofwn_init: Open Firmware instance handle: %08x\n", netinstance);
 #endif
 
 #ifndef __sparc64__
diff --git a/sys/boot/ofw/libofw/openfirm.c b/sys/boot/ofw/libofw/openfirm.c
index 41efbf6..b1d2b40 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/sys/boot/ofw/libofw/openfirm.c
@@ -862,7 +862,7 @@ OF_boot(char *bootspec)
 	for (;;);			/* just in case */
 }
 
-/* Suspend and drop back to the OpenFirmware interface. */
+/* Suspend and drop back to the Open Firmware interface. */
 void
 OF_enter()
 {
@@ -879,7 +879,7 @@ OF_enter()
 	openfirmware(&args);
 }
 
-/* Shut down and drop back to the OpenFirmware interface. */
+/* Shut down and drop back to the Open Firmware interface. */
 void
 OF_exit()
 {
diff --git a/sys/boot/ofw/libofw/openfirm.h b/sys/boot/ofw/libofw/openfirm.h
index e060117..40382cd 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/sys/boot/ofw/libofw/openfirm.h
@@ -59,7 +59,7 @@
 #ifndef _OPENFIRM_H_
 #define	_OPENFIRM_H_
 /*
- * Prototypes for Openfirmware Interface Routines
+ * Prototypes for Open Firmware Interface Routines
  */
 
 #include <sys/cdefs.h>
@@ -74,7 +74,7 @@ extern phandle_t	chosen;
 extern ihandle_t	memory, mmu;
 
 /*
- * This isn't actually an OpenFirmware function, but it seemed like the right
+ * This isn't actually an Open Firmware function, but it seemed like the right
  * place for it to go.
  */
 void		OF_init(int (*openfirm)(void *));
diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile
index 92714a3..d39c815 100644
--- a/sys/boot/powerpc/loader/Makefile
+++ b/sys/boot/powerpc/loader/Makefile
@@ -2,7 +2,7 @@
 
 PROG=		loader
 NOMAN=
-NEWVERSWHAT=	"bootstrap loader" OpenFirmware/PowerPC
+NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
@@ -76,7 +76,7 @@ CFLAGS+= -Wa,-mppc64bridge
 .PATH:		${.CURDIR}/../../ofw/common
 .include	"${.CURDIR}/../../ofw/common/Makefile.inc"
 
-# OpenFirmware standalone support library
+# Open Firmware standalone support library
 LIBOFW=		${.OBJDIR}/../../ofw/libofw/libofw.a
 CFLAGS+=	-I${.CURDIR}/../../ofw/libofw
 
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index 92714a3..d39c815 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -2,7 +2,7 @@
 
 PROG=		loader
 NOMAN=
-NEWVERSWHAT=	"bootstrap loader" OpenFirmware/PowerPC
+NEWVERSWHAT=	"bootstrap loader" "Open Firmware/PowerPC"
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
 
@@ -76,7 +76,7 @@ CFLAGS+= -Wa,-mppc64bridge
 .PATH:		${.CURDIR}/../../ofw/common
 .include	"${.CURDIR}/../../ofw/common/Makefile.inc"
 
-# OpenFirmware standalone support library
+# Open Firmware standalone support library
 LIBOFW=		${.OBJDIR}/../../ofw/libofw/libofw.a
 CFLAGS+=	-I${.CURDIR}/../../ofw/libofw
 
diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c
index 685e33f..4c2786f 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/sys/boot/sparc64/boot1/boot1.c
@@ -432,7 +432,7 @@ static int
 dskread(void *buf, u_int64_t lba, int nblk)
 {
 	/*
-	 * The OpenFirmware should open the correct partition for us.
+	 * The Open Firmware should open the correct partition for us.
 	 * That means, if we read from offset zero on an open instance handle,
 	 * we should read from offset zero of that partition.
 	 */
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index 44c6c1b..31129cd 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -58,7 +58,7 @@ CLEANFILES+=	vers.c loader.help
 
 LDFLAGS=	-static
 
-# Openfirmware standalone support library
+# Open Firmware standalone support library
 LIBOFW=		${.OBJDIR}/../../ofw/libofw/libofw.a
 CFLAGS+=	-I${.CURDIR}/../../ofw/libofw/
 
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 95790f1..9a8a8fa 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -369,7 +369,7 @@ main(int (*openfirm)(void *))
 	phandle_t chosenh;
 
 	/*
-	 * Tell the OpenFirmware functions where they find the ofw gate.
+	 * Tell the Open Firmware functions where they find the ofw gate.
 	 */
 	OF_init(openfirm);