13 files changed, 26 insertions, 26 deletions
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index 3df479b5..ae3e8154 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6DL SABRE Automotive
+#@NAME: NXP i.MX6DL SABRE Automotive
 #@SOC: i.MX6DL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive
+#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Automotive
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
 MACHINEOVERRIDES =. "mx6:mx6dl:"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 99432462..27b8391c 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6DL SABRE Smart Device
+#@NAME: NXP i.MX6DL SABRE Smart Device
 #@SOC: i.MX6DL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device
+#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
 MACHINEOVERRIDES =. "mx6:mx6dl:"
diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf
index f8e914a6..505d341c 100644
--- a/conf/machine/imx6qpsabreauto.conf
+++ b/conf/machine/imx6qpsabreauto.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Q Plus SABRE Automotive
+#@NAME: NXP i.MX6Q Plus SABRE Automotive
 #@SOC: i.MX6QP
-#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Automotive
+#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Automotive
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
 MACHINEOVERRIDES =. "mx6:mx6q:"
diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf
index 580c8381..369d5b7d 100644
--- a/conf/machine/imx6qpsabresd.conf
+++ b/conf/machine/imx6qpsabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Q Plus SABRE Smart Device
+#@NAME: NXP i.MX6Q Plus SABRE Smart Device
 #@SOC: i.MX6QP
-#@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device
+#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Smart Device
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
 MACHINEOVERRIDES =. "mx6:mx6q:"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index e25a7330..7bb0cfab 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Q SABRE Automotive
+#@NAME: NXP i.MX6Q SABRE Automotive
 #@SOC: i.MX6Q
-#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive
+#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Automotive
 #@MAINTAINER: Daiane Angolini <daiane.angolini@freescale.com>
 
 MACHINEOVERRIDES =. "mx6:mx6q:"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index 33fff89c..ea9119a9 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Q SABRE Smart Device
+#@NAME: NXP i.MX6Q SABRE Smart Device
 #@SOC: i.MX6Q
-#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device
+#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
 MACHINEOVERRIDES =. "mx6:mx6q:"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 02cb8f03..52b4000e 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6SL Evaluation Kit
+#@NAME: NXP i.MX6SL Evaluation Kit
 #@SOC: i.MX6SL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6SL Evaluation Kit
+#@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
 MACHINEOVERRIDES =. "mx6:mx6sl:"
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
index 3ced78d3..09997c33 100644
--- a/conf/machine/imx6solosabreauto.conf
+++ b/conf/machine/imx6solosabreauto.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Solo SABRE Automotive
+#@NAME: NXP i.MX6Solo SABRE Automotive
 #@SOC: i.MX6S
-#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive
+#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Automotive
 
 MACHINEOVERRIDES =. "mx6:mx6dl:"
 
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
index 24fa6496..65155bcc 100644
--- a/conf/machine/imx6solosabresd.conf
+++ b/conf/machine/imx6solosabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6Solo SABRE Smart Device
+#@NAME: NXP i.MX6Solo SABRE Smart Device
 #@SOC: i.MX6S
-#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Smart Device
+#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Smart Device
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
 MACHINEOVERRIDES =. "mx6:mx6dl:"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 4f399a39..b3bae2a4 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6SoloX Sabre Automotive
+#@NAME: NXP i.MX6SoloX Sabre Automotive
 #@SOC: i.MX6SX
-#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre Automotive
+#@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
 MACHINEOVERRIDES =. "mx6:mx6sx:"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 857b7350..d702bed7 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6SoloX SabreSD
+#@NAME: NXP i.MX6SoloX SabreSD
 #@SOC: i.MX6SX
-#@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD
+#@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
 MACHINEOVERRIDES =. "mx6:mx6sx:"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index ae20ab87..ca69e75f 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX6UL Evaluation Kit
+#@NAME: NXP i.MX6UL Evaluation Kit
 #@SOC: i.MX6UL
-#@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK
+#@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
 MACHINEOVERRIDES =. "mx6ul:"
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 5d74997b..3a05d169 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: Freescale i.MX7D SABRE Smart Device
+#@NAME: NXP i.MX7D SABRE Smart Device
 #@SOC: i.MX7D
-#@DESCRIPTION: Machine configuration for Freescale i.MX7D SABRE Smart Device
+#@DESCRIPTION: Machine configuration for NXP i.MX7D SABRE Smart Device
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
 MACHINEOVERRIDES =. "mx7:mx7d:"