diff --git a/arch/arm/dts/am335x-igep0033.dtsi b/arch/arm/dts/am335x-igep0033.dtsi
index ad57c74..4488dcc 100644
--- a/arch/arm/dts/am335x-igep0033.dtsi
+++ b/arch/arm/dts/am335x-igep0033.dtsi
@@ -175,7 +175,7 @@
 		};
 
 		partition@1 {
-			label = "U-boot";
+			label = "U-Boot";
 			reg = <0x00080000 0x001e0000>;
 		};
 
diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 3e5789f..1ee9240 100644
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -180,7 +180,7 @@
 				reg = <0x0 0x200000>;
 			};
 			partition@200000 {
-				label = "U-boot Env";
+				label = "U-Boot Env";
 				reg = <0x200000 0x10000>;
 			};
 			partition@210000 {
diff --git a/board/armadeus/opos6uldev/opos6uldev.env b/board/armadeus/opos6uldev/opos6uldev.env
index 585f28c..f900297 100644
--- a/board/armadeus/opos6uldev/opos6uldev.env
+++ b/board/armadeus/opos6uldev/opos6uldev.env
@@ -42,8 +42,8 @@
 		setexpr sz ${filesize} / 0x200;
 		setexpr sz ${sz} + 1;
 		if mmc write ${loadaddr} 0x2 ${sz}; then
-			echo Flashing of U-boot SPL succeed;
-		else echo Flashing of U-boot SPL failed;
+			echo Flashing of U-Boot SPL succeed;
+		else echo Flashing of U-Boot SPL failed;
 		fi;
 	fi;
 download_uboot_img=tftpboot ${loadaddr} ${board_name}-u-boot.img
@@ -52,8 +52,8 @@
 		setexpr sz ${filesize} / 0x200;
 		setexpr sz ${sz} + 1;
 		if mmc write ${loadaddr} 0x8a ${sz}; then
-			echo Flashing of U-boot image succeed;
-		else echo Flashing of U-boot image failed;
+			echo Flashing of U-Boot image succeed;
+		else echo Flashing of U-Boot image failed;
 		fi;
 	fi;
 update_uboot=run download_uboot_spl flash_uboot_spl
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index b47ce05..87ed814 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -127,7 +127,7 @@
 				   &img_addr);
 
 	if (res == 0)
-		printf("SPL: Validation of U-boot successful\n");
+		printf("SPL: Validation of U-Boot successful\n");
 }
 
 #ifdef CONFIG_SPL_FRAMEWORK
diff --git a/board/freescale/ls1012afrdm/README b/board/freescale/ls1012afrdm/README
index 382b668..e60ed60 100644
--- a/board/freescale/ls1012afrdm/README
+++ b/board/freescale/ls1012afrdm/README
@@ -52,7 +52,7 @@
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot		| 1MB	| 0x4010_0000
-U-boot Env	| 1MB	| 0x4020_0000
+U-Boot		| 1MB	| 0x4010_0000
+U-Boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
diff --git a/board/freescale/ls1012aqds/README b/board/freescale/ls1012aqds/README
index c1956f9..e9b80ca 100644
--- a/board/freescale/ls1012aqds/README
+++ b/board/freescale/ls1012aqds/README
@@ -53,7 +53,7 @@
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot		| 1MB	| 0x4010_0000
-U-boot Env	| 1MB	| 0x4020_0000
+U-Boot		| 1MB	| 0x4010_0000
+U-Boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
diff --git a/board/freescale/ls1012ardb/README b/board/freescale/ls1012ardb/README
index 5b6f306..26b0485 100644
--- a/board/freescale/ls1012ardb/README
+++ b/board/freescale/ls1012ardb/README
@@ -48,8 +48,8 @@
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot		| 1MB	| 0x4010_0000
-U-boot Env	| 1MB	| 0x4020_0000
+U-Boot		| 1MB	| 0x4010_0000
+U-Boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
 
@@ -90,8 +90,8 @@
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot		| 1MB	| 0x4010_0000
-U-boot Env	| 1MB	| 0x4030_0000
+U-Boot		| 1MB	| 0x4010_0000
+U-Boot Env	| 1MB	| 0x4030_0000
 PPA FIT image	| 2MB	| 0x4040_0000
 PFE firmware	| 20K	| 0x00a0_0000
 Linux ITB	| ~53MB | 0x4100_0000
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 1b8a47d..c246a7b 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -16,7 +16,7 @@
 {
 	u32 changelist;
 
-	lowlevel_display("U-boot  ");
+	lowlevel_display("U-Boot  ");
 
 	printf("Board: MIPS Boston\n");
 
diff --git a/include/dt-bindings/memory/bcm-ns3-mc.h b/include/dt-bindings/memory/bcm-ns3-mc.h
index 84795ec..d2478d9 100644
--- a/include/dt-bindings/memory/bcm-ns3-mc.h
+++ b/include/dt-bindings/memory/bcm-ns3-mc.h
@@ -28,7 +28,7 @@
 #define BCM_NS3_MEM_SHARE_START    0x8d000000
 #define BCM_NS3_MEM_SHARE_LEN      0x020fffff
 
-/* ATF/U-boot/Linux error logs */
+/* ATF/U-Boot/Linux error logs */
 #define BCM_NS3_MEM_ELOG_START     0x8f113000
 #define BCM_NS3_MEM_ELOG_LEN       0x00100000