37 files changed, 74 insertions, 74 deletions
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 333ee73a..2db738e1 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale B4420QDS-64B
+#@NAME: NXP B4420QDS-64B
 #@SOC: b4420
-#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4420
+#@DESCRIPTION: Machine configuration for NXP QorIQ Qonverge B4420
 #              Application Development System with ppce6500 core in
 #              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index e78f6d88..bba3f974 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale B4420QDS
+#@NAME: NXP B4420QDS
 #@SOC: b4420
-#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4420
+#@DESCRIPTION: Machine configuration for NXP QorIQ Qonverge B4420
 #              Application Development System with ppce6500 core in
 #              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 6dc2a2b2..a7a5c50d 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale B4860QDS-64B
+#@NAME: NXP B4860QDS-64B
 #@SOC: b4860
-#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4860
+#@DESCRIPTION: Machine configuration for NXP QorIQ Qonverge B4860
 #              Application Development System with ppce6500 core in
 #              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 13fc6648..ee4180b4 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale B4860QDS
+#@NAME: NXP B4860QDS
 #@SOC: b4860
-#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4860
+#@DESCRIPTION: Machine configuration for NXP QorIQ Qonverge B4860
 #              Application Development System with ppce6500 core in
 #              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index 3cf443b8..da619200 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale C293PCIE
+#@NAME: NXP C293PCIE
 #@SOC: c293pcie
-#@DESCRIPTION: Machine configuration for Freescale C29x Crypto Coprocessor
+#@DESCRIPTION: Machine configuration for NXP C29x Crypto Coprocessor
 #              PCI Express Adapter Platform with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 6c4daa5c..5b977ca1 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX23 Evaluation Kit
+#@NAME: NXP i.MX23 Evaluation Kit
 #@SOC: i.MX23
-#@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit
+#@DESCRIPTION: Machine configuration for NXP i.MX23 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 MACHINEOVERRIDES =. "mxs:mx23:"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 5bdbcade..937fd143 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX28 Evaluation Kit
+#@NAME: NXP i.MX28 Evaluation Kit
 #@SOC: i.MX28
-#@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit
+#@DESCRIPTION: Machine configuration for NXP i.MX28 Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 MACHINEOVERRIDES =. "mxs:mx28:"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 9b5757a0..a32b4e00 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX51 Evaluation Kit
+#@NAME: NXP i.MX51 Evaluation Kit
 #@SOC: i.MX51
-#@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit
+#@DESCRIPTION: Machine configuration for NXP i.MX51 Evaluation Kit
 #@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
 MACHINEOVERRIDES =. "mx5:mx51:"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index 71ceb95c..c6d7f0d9 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX53 SABRE Automotive Board
+#@NAME: NXP i.MX53 SABRE Automotive Board
 #@SOC: i.MX53
-#@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive Board
+#@DESCRIPTION: Machine configuration for NXP i.MX53 SABRE Automotive Board
 #@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
 MACHINEOVERRIDES =. "mx5:mx53:"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index dc264c4a..24cbfac6 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX53 Quick Start Board
+#@NAME: NXP i.MX53 Quick Start Board
 #@SOC: i.MX53
-#@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board
+#@DESCRIPTION: Machine configuration for NXP i.MX53 Quick Start Board
 #@MAINTAINER: Trevor Woerner <trevor.woerner@linaro.org>
 MACHINEOVERRIDES =. "mx5:mx53:"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 8006885c..ce33bb6f 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale LS1021ATWR board
+#@NAME: NXP LS1021ATWR board
 #@SOC: ls102xa
-#@DESCRIPTION: Machine configuration for Freescale QorIQ LS1 Tower System
+#@DESCRIPTION: Machine configuration for NXP QorIQ LS1 Tower System
 #              Module Rev2.0 with ARM Cortex-A7 core
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index c36f1095..a5790219 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P2041RDB
+#@NAME: NXP P2041RDB
 #@SOC: p2041
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P2041 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ P2041 Reference
 #              Design Board, rev2 silicon with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index d68f98c3..91cdb9c4 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P3041DS
+#@NAME: NXP P3041DS
 #@SOC: p3041
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P3041 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P3041 Development
 #              System with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 8bafa278..90cc74e0 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P4080DS
+#@NAME: NXP P4080DS
 #@SOC: p4080
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P4080 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P4080 Development
 #              System with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 717ca416..4038519e 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P5020DS-64B
+#@NAME: NXP P5020DS-64B
 #@SOC: p5020
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P5020 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P5020 Development
 #              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 748c4841..ff3bcd43 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P5020DS
+#@NAME: NXP P5020DS
 #@SOC: p5020
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P5020 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P5020 Development
 #              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 05759aec..de2b9189 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P5040DS-64B
+#@NAME: NXP P5040DS-64B
 #@SOC: p5040
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P5040 Development
 #              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index d5ad9a7c..d4841bbc 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale P5040DS
+#@NAME: NXP P5040DS
 #@SOC: p5040
-#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ P5040 Development
 #              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index 6120d578..deb3fa79 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1023RDB
+#@NAME: NXP T1023RDB
 #@SOC: t1023
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1023 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1023 Reference
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index 1dce7d57..c620e1ac 100644
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1023RDB
+#@NAME: NXP T1023RDB
 #@SOC: t1023
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1023 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1023 Reference
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index cdb77cd0..85cb2f8f 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1024RDB
+#@NAME: NXP T1024RDB
 #@SOC: t1024
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1024 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1024 Reference
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 9ce6257b..b4f6e057 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1024RDB
+#@NAME: NXP T1024RDB
 #@SOC: t1024
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1024 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1024 Reference
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 4f00ec6b..19c013e7 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1040D4RDB
+#@NAME: NXP T1040D4RDB
 #@SOC: t1040
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1040D4 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1040D4 Reference
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 456cf440..faa17d04 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1040D4RDB
+#@NAME: NXP T1040D4RDB
 #@SOC: t1040
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1040D4 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1040D4 Reference
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 7f54bebb..0ec19139 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1042D4RDB
+#@NAME: NXP T1042D4RDB
 #@SOC: t1042
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1042D4 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1042D4 Reference
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 4fc882ad..38ea1dc7 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T1042D4RDB
+#@NAME: NXP T1042D4RDB
 #@SOC: t1042
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T1042D4 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T1042D4 Reference
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 39e5b902..eb3072ce 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T2080QDS-64B
+#@NAME: NXP T2080QDS-64B
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T2080 Development
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index ac63edff..cef15d7d 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T2080QDS
+#@NAME: NXP T2080QDS
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T2080 Development
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 6baa6a72..ebd0cd9d 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T2080RDB
+#@NAME: NXP T2080RDB
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T2080 Reference
 #              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 4b44c2e1..cd618a61 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T2080RDB
+#@NAME: NXP T2080RDB
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T2080 Reference
 #              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index dbf033c1..6b074820 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4160QDS-64B
+#@NAME: NXP T4160QDS-64B
 #@SOC: t4160
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4160 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4160 Development
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 1e1b6e53..d5070bac 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4160QDS
+#@NAME: NXP T4160QDS
 #@SOC: t4160
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4160 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4160 Development
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 8c27cfc5..efb2b7c4 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4240QDS-64B
+#@NAME: NXP T4240QDS-64B
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4240 Development
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 41b08988..d68eba22 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4240QDS
+#@NAME: NXP T4240QDS
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Development
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4240 Development
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 7973506f..5ab7f23d 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4240RDB
+#@NAME: NXP T4240RDB
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4240 Reference
 #              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 5819e204..4d3549e7 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale T4240RDB
+#@NAME: NXP T4240RDB
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Reference
+#@DESCRIPTION: Machine configuration for NXP QorIQ T4240 Reference
 #              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf
index c14ee5ba..67fddaa9 100644
--- a/conf/machine/twr-vf65gs10.conf
+++ b/conf/machine/twr-vf65gs10.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale Vybrid TWR-VF65GS10
+#@NAME: NXP Vybrid TWR-VF65GS10
 #@SOC: VF610
-#@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10
+#@DESCRIPTION: Machine configuration for NXP Vybrid TWR-VF65GS10
 #@MAINTAINER: Stefan Agner <stefan.agner@toradex.com>
 MACHINEOVERRIDES =. "vf:vf60:"