diff --git a/portable/GCC/AVR32_UC3/port.c b/portable/GCC/AVR32_UC3/port.c
index bc94b6ae5..d720c8de8 100644
--- a/portable/GCC/AVR32_UC3/port.c
+++ b/portable/GCC/AVR32_UC3/port.c
@@ -7,7 +7,8 @@
  * - Supported devices:  All AVR32 devices can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support/
  *
  *****************************************************************************/
diff --git a/portable/GCC/AVR32_UC3/portmacro.h b/portable/GCC/AVR32_UC3/portmacro.h
index 0314ae423..7d12eeb4f 100644
--- a/portable/GCC/AVR32_UC3/portmacro.h
+++ b/portable/GCC/AVR32_UC3/portmacro.h
@@ -7,7 +7,8 @@
  * - Supported devices:  All AVR32 devices can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support/
  *
  *****************************************************************************/
diff --git a/portable/IAR/AVR32_UC3/exception.s82 b/portable/IAR/AVR32_UC3/exception.s82
index aeb367067..917559dda 100644
--- a/portable/IAR/AVR32_UC3/exception.s82
+++ b/portable/IAR/AVR32_UC3/exception.s82
@@ -9,7 +9,8 @@
  * - Supported devices:  All AVR32UC devices with an INTC module can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+                                          https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support
  *
  ******************************************************************************/
diff --git a/portable/IAR/AVR32_UC3/port.c b/portable/IAR/AVR32_UC3/port.c
index aad06650e..2f6d00512 100644
--- a/portable/IAR/AVR32_UC3/port.c
+++ b/portable/IAR/AVR32_UC3/port.c
@@ -7,7 +7,8 @@
  * - Supported devices:  All AVR32 devices can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support/
  *
  *****************************************************************************/
diff --git a/portable/IAR/AVR32_UC3/portmacro.h b/portable/IAR/AVR32_UC3/portmacro.h
index 0642ec2b4..28f6a3ce6 100644
--- a/portable/IAR/AVR32_UC3/portmacro.h
+++ b/portable/IAR/AVR32_UC3/portmacro.h
@@ -7,7 +7,8 @@
  * - Supported devices:  All AVR32 devices can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com
  *                       Support and FAQ: https://www.microchip.com/support
  *
  *****************************************************************************/
diff --git a/portable/IAR/AVR32_UC3/read.c b/portable/IAR/AVR32_UC3/read.c
index dda1daa7c..7638249ab 100644
--- a/portable/IAR/AVR32_UC3/read.c
+++ b/portable/IAR/AVR32_UC3/read.c
@@ -8,7 +8,8 @@
  * - Supported devices:  All AVR32 devices with a USART module can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support/
  *
  ******************************************************************************/
diff --git a/portable/IAR/AVR32_UC3/write.c b/portable/IAR/AVR32_UC3/write.c
index f25acc19d..0b3a8084f 100644
--- a/portable/IAR/AVR32_UC3/write.c
+++ b/portable/IAR/AVR32_UC3/write.c
@@ -8,7 +8,8 @@
  * - Supported devices:  All AVR32 devices with a USART module can be used.
  * - AppNote:
  *
- * \author               Atmel Corporation: https://www.microchip.com \n
+ * \author               Atmel Corporation (now Microchip):
+ *                                        https://www.microchip.com \n
  *                       Support and FAQ: https://www.microchip.com/support
  *
  ******************************************************************************/
diff --git a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
index 8483af3e2..fb2dd64e5 100644
--- a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
+++ b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
@@ -57,9 +57,9 @@
  *  Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
  *
  *  https://www.highintegritysystems.com/openrtos/ - Real Time Engineers ltd.
- *  license FreeRTOS to High Integrity Systems ltd. to sell under
- *  the OpenRTOS brand.  Low cost OpenRTOS licenses offer ticketed support,
- *  indemnification and commercial middleware.
+ *  license FreeRTOS to High Integrity Systems ltd. to sell under the OpenRTOS
+ *  brand.  Low cost OpenRTOS licenses offer ticketed support, indemnification
+ *  and commercial middleware.
  *
  *  https://www.highintegritysystems.com/safertos/ - High Integrity Systems
  *  also provide a safety engineered and independently SIL3 certified version