diff --git a/gcc/common/config/avr/avr-common.cc b/gcc/common/config/avr/avr-common.cc
index fdf130f1e1ae1ce9d82e8f44196ecadbfe53c0c4..bb454a20856897b2d2e21dc92b629d0da7baeecc 100644
--- a/gcc/common/config/avr/avr-common.cc
+++ b/gcc/common/config/avr/avr-common.cc
@@ -1,4 +1,4 @@
-/* Common hooks for ATMEL AVR.
+/* Common hooks for AVR 8-bit microcontrollers.
    Copyright (C) 1998-2024 Free Software Foundation, Inc.
 
    This file is part of GCC.
diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h
index 69e8db1fcfe2f62c35a7561295be55e8c2cf5d5a..e7c02ebfbb06c697e245daf4d4d3e1243b6f9d3f 100644
--- a/gcc/config/avr/avr-arch.h
+++ b/gcc/config/avr/avr-arch.h
@@ -1,5 +1,4 @@
-/* Definitions of types that are used to store AVR architecture and
-   device information.
+/* Device information for AVR 8-bit microcontrollers.
    Copyright (C) 2012-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
 
diff --git a/gcc/config/avr/avr-c.cc b/gcc/config/avr/avr-c.cc
index ca484f26132a3abadd7f6083d7b312b88f291005..34c73c6bf55287223a2ef709d14137b7dbc8a6f9 100644
--- a/gcc/config/avr/avr-c.cc
+++ b/gcc/config/avr/avr-c.cc
@@ -1,4 +1,5 @@
-/* Copyright (C) 2009-2024 Free Software Foundation, Inc.
+/* Code for the C/C++ front end for AVR 8-bit microcontrollers.
+   Copyright (C) 2009-2024 Free Software Foundation, Inc.
    Contributed by Anatoly Sokolov (aesok@post.ru)
 
    This file is part of GCC.
diff --git a/gcc/config/avr/avr-dimode.md b/gcc/config/avr/avr-dimode.md
index c357213e211a832dc6bc99f5a5345489765d1824..e6284ced45dfecce82580445f903c878f78591a4 100644
--- a/gcc/config/avr/avr-dimode.md
+++ b/gcc/config/avr/avr-dimode.md
@@ -1,5 +1,4 @@
-;;   Machine description for GNU compiler,
-;;   for Atmel AVR micro controllers.
+;;   Support 64-bit operations for AVR 8-bit microcontrollers.
 ;;   Copyright (C) 1998-2024 Free Software Foundation, Inc.
 ;;   Contributed by Georg Lay (avr@gjlay.de)
 ;;
diff --git a/gcc/config/avr/avr-fixed.md b/gcc/config/avr/avr-fixed.md
index 911b8b2cd67c75d2db807d87248b295a9d0e713a..eb83751a768e730b91df085c2dd596735cb5bbff 100644
--- a/gcc/config/avr/avr-fixed.md
+++ b/gcc/config/avr/avr-fixed.md
@@ -1,5 +1,4 @@
-;;   This file contains instructions that support fixed-point operations
-;;   for Atmel AVR micro controllers.
+;;   Support fixed-point operations for AVR 8-bit microcontrollers.
 ;;   Copyright (C) 2012-2024 Free Software Foundation, Inc.
 ;;
 ;;   Contributed by Sean D'Epagnier  (sean@depagnier.com)
diff --git a/gcc/config/avr/avr-log.cc b/gcc/config/avr/avr-log.cc
index d702c5f3fd8648f486b362365543f18d72da5f40..5aacab19e388086f12a5598cc11d600634951598 100644
--- a/gcc/config/avr/avr-log.cc
+++ b/gcc/config/avr/avr-log.cc
@@ -1,4 +1,4 @@
-/* Subroutines for log output for Atmel AVR back end.
+/* Subroutines for log output for AVR 8-bit microcontrollers.
    Copyright (C) 2011-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
 
diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def
index 068875a2c60ed3b082b72a02c6891b8e44fa73e0..f7401ab3b09a3c088e309dc9a9a366dada005aaa 100644
--- a/gcc/config/avr/avr-mcus.def
+++ b/gcc/config/avr/avr-mcus.def
@@ -1,4 +1,4 @@
-/* AVR MCUs.
+/* Information on supported AVR 8-bit microcontrollers.
    Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
    This file is part of GCC.
diff --git a/gcc/config/avr/avr-modes.def b/gcc/config/avr/avr-modes.def
index b756beae9a0c2ef7d28910495328c13638544346..e69636a609917804b46d7748e8bb5cf17ab99b17 100644
--- a/gcc/config/avr/avr-modes.def
+++ b/gcc/config/avr/avr-modes.def
@@ -1,4 +1,5 @@
-/* Copyright (C) 2012-2024 Free Software Foundation, Inc.
+/* Extra machine modes for AVR 8-bit microcontrollers.
+   Copyright (C) 2012-2024 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
diff --git a/gcc/config/avr/avr-passes.cc b/gcc/config/avr/avr-passes.cc
index 8a71b57ada104ca2cc893de1ff39ef493456f8d5..95b8e9a7529b4810f0e3853a950c3ae3f41cf9c6 100644
--- a/gcc/config/avr/avr-passes.cc
+++ b/gcc/config/avr/avr-passes.cc
@@ -1,4 +1,4 @@
-/* Functions and methods for avr specific passes registered in avr-passes.def.
+/* Support for avr-passes.def for AVR 8-bit microcontrollers.
    Copyright (C) 2024 Free Software Foundation, Inc.
 
    This file is part of GCC.
diff --git a/gcc/config/avr/avr-passes.def b/gcc/config/avr/avr-passes.def
index cd89d67372765d421928ca8e0f85d6bcec8fe37c..d39bdd89a11b00b8e728071b07593c5d51f65b88 100644
--- a/gcc/config/avr/avr-passes.def
+++ b/gcc/config/avr/avr-passes.def
@@ -1,4 +1,4 @@
-/* Description of target passes for AVR.
+/* Description of target passes for AVR 8-bit microcontrollers.
    Copyright (C) 2016-2024 Free Software Foundation, Inc. */
 
 /* This file is part of GCC.
diff --git a/gcc/config/avr/avr-protos.h b/gcc/config/avr/avr-protos.h
index d6f4abbac669a0ed0b68b716cf3a948088b05c36..71c110c791ff0edea6344210a9f8d787733b5a80 100644
--- a/gcc/config/avr/avr-protos.h
+++ b/gcc/config/avr/avr-protos.h
@@ -1,5 +1,4 @@
-/* Prototypes for exported functions defined in avr.cc
-   
+/* Prototypes for tm_p.h for AVR 8-bit microcontrollers.
    Copyright (C) 2000-2024 Free Software Foundation, Inc.
    Contributed by Denis Chertykov (chertykov@gmail.com)
 
diff --git a/gcc/config/avr/avr.cc b/gcc/config/avr/avr.cc
index 079db62695dc92804ce718adc98bb512135a4b72..1f809d8e1e3bf96b526f34fae87241b847e4b802 100644
--- a/gcc/config/avr/avr.cc
+++ b/gcc/config/avr/avr.cc
@@ -1,4 +1,4 @@
-/* Subroutines for insn-output.cc for ATMEL AVR micro controllers
+/* Subroutines for insn-output.cc for AVR 8-bit microcontrollers
    Copyright (C) 1998-2024 Free Software Foundation, Inc.
    Contributed by Denis Chertykov (chertykov@gmail.com)
 
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 56b7f39b8344913b9f35613787a6a92c04202583..1cf4180e53438ac3f7478790ade86952cb8eade1 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler,
-   for ATMEL AVR at90s8515, ATmega103/103L, ATmega603/603L microcontrollers.
+   for AVR 8-bit microcontrollers.
    Copyright (C) 1998-2024 Free Software Foundation, Inc.
    Contributed by Denis Chertykov (chertykov@gmail.com)
 
diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md
index 520f1fe41a217a1057e74540ac63b07de277e04f..429f537b7d4f7c26bb0e2cfc1ff3c10fac0d40dd 100644
--- a/gcc/config/avr/avr.md
+++ b/gcc/config/avr/avr.md
@@ -1,5 +1,5 @@
 ;;   Machine description for GNU compiler,
-;;   for ATMEL AVR micro controllers.
+;;   for AVR 8-bit microcontrollers.
 ;;   Copyright (C) 1998-2024 Free Software Foundation, Inc.
 ;;   Contributed by Denis Chertykov (chertykov@gmail.com)
 
diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt
index 444ed7edb26bc7d2a8d7027b8a23a978eca61ed9..625323f4e6a6ddb77dd1c4b8b2e37ae46f826d16 100644
--- a/gcc/config/avr/avr.opt
+++ b/gcc/config/avr/avr.opt
@@ -1,4 +1,4 @@
-; Options for the ATMEL AVR port of the compiler.
+; Options for AVR 8-bit microcontrollers.
 
 ; Copyright (C) 2005-2024 Free Software Foundation, Inc.
 ;
diff --git a/gcc/config/avr/avrlibc.h b/gcc/config/avr/avrlibc.h
index fb4ffedcc91f5394b349668e26b89f47c42cfde0..60fce70201c6bef81e9f14d76ab1965bac1f7011 100644
--- a/gcc/config/avr/avrlibc.h
+++ b/gcc/config/avr/avrlibc.h
@@ -1,5 +1,4 @@
-/* Definitions of target machine for the GNU compiler collection
-   for Atmel AVR micro controller if configured for AVR-Libc.
+/* Definitions for AVR 8-bit microcontrollers if configured for AVR-LibC.
    Copyright (C) 2012-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
 
diff --git a/gcc/config/avr/constraints.md b/gcc/config/avr/constraints.md
index 963e23a4d9ed53ce22cb28234535469bba18e555..9512302c252e2cd065dafb93bb40ceb541d92f86 100644
--- a/gcc/config/avr/constraints.md
+++ b/gcc/config/avr/constraints.md
@@ -1,4 +1,4 @@
-;; Constraint definitions for ATMEL AVR micro controllers.
+;; Insn constraint definitions for AVR 8-bit microcontrollers.
 ;; Copyright (C) 2006-2024 Free Software Foundation, Inc.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/avr/driver-avr.cc b/gcc/config/avr/driver-avr.cc
index 92e875a66c9eb48b1e03b9a39ad99d6b4f0c2293..4dcabc604e85d95bd0044893e4cc34a3c6236c35 100644
--- a/gcc/config/avr/driver-avr.cc
+++ b/gcc/config/avr/driver-avr.cc
@@ -1,4 +1,4 @@
-/* Subroutines for the gcc driver.
+/* Subroutines for the gcc driver for AVR 8-bit microcontrollers.
    Copyright (C) 2009-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay <avr@gjlay.de>
 
diff --git a/gcc/config/avr/elf.h b/gcc/config/avr/elf.h
index 0112aa3d432756322756d2561696f419fa48ce0c..794f4c9fc0fbce6ffed6dbc0e3b09ff90eb8fb89 100644
--- a/gcc/config/avr/elf.h
+++ b/gcc/config/avr/elf.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2024 Free Software Foundation, Inc.
+/* Overrides for elfos.h for AVR 8-bit microcontrollers.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
 
    This file is part of GCC.
diff --git a/gcc/config/avr/gen-avr-mmcu-specs.cc b/gcc/config/avr/gen-avr-mmcu-specs.cc
index bb94bea12b00351c90d39242958fb2ccdf55534b..af519c9d87ae2e6bf723a6090dcb63f63f63e044 100644
--- a/gcc/config/avr/gen-avr-mmcu-specs.cc
+++ b/gcc/config/avr/gen-avr-mmcu-specs.cc
@@ -1,4 +1,5 @@
-/* Copyright (C) 1998-2024 Free Software Foundation, Inc.
+/* Build device-specs for AVR 8-bit microcontrollers.
+   Copyright (C) 1998-2024 Free Software Foundation, Inc.
    Contributed by Joern Rennecke
 
    This file is part of GCC.
diff --git a/gcc/config/avr/gen-avr-mmcu-texi.cc b/gcc/config/avr/gen-avr-mmcu-texi.cc
index 70aa430902ebfec2ee8fdef8fe2e8b3150d85c44..597ba22ccaac9bca209d7f0cfb4932e8b0218394 100644
--- a/gcc/config/avr/gen-avr-mmcu-texi.cc
+++ b/gcc/config/avr/gen-avr-mmcu-texi.cc
@@ -1,4 +1,5 @@
-/* Copyright (C) 2012-2024 Free Software Foundation, Inc.
+/* Build texi documentation for option -mmcu for AVR 8-bit microcontrollers.
+   Copyright (C) 2012-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
 
    This file is part of GCC.
diff --git a/gcc/config/avr/predicates.md b/gcc/config/avr/predicates.md
index b21acbe323f9b2eea16750ba2b98b6e988a8bdc9..c44ebffc7628cd9309395693dbc9b780efd0cf32 100644
--- a/gcc/config/avr/predicates.md
+++ b/gcc/config/avr/predicates.md
@@ -1,4 +1,4 @@
-;; Predicate definitions for ATMEL AVR micro controllers.
+;; Insn predicate definitions for AVR 8-bit microcontrollers.
 ;; Copyright (C) 2006-2024 Free Software Foundation, Inc.
 ;;
 ;; This file is part of GCC.
diff --git a/gcc/config/avr/specs.h b/gcc/config/avr/specs.h
index 0ccc37b8844a18d1b70fc9e9dd40863e771668e0..a1e2c384a7430fbf0714b62c02a511b24f962b9e 100644
--- a/gcc/config/avr/specs.h
+++ b/gcc/config/avr/specs.h
@@ -1,4 +1,4 @@
-/* Specs definitions for Atmel AVR back end.
+/* Specs definitions for AVR 8-bit microcontrollers.
 
    Copyright (C) 2012-2024 Free Software Foundation, Inc.
    Contributed by Georg-Johann Lay (avr@gjlay.de)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index d22ccdd96672c3fffb0f0dea14102b4c7d80cbc0..62a6110459850b992b2b4e716f7eb53978ede2b4 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -3999,7 +3999,7 @@ GNAT 4.6, 4.9 or 5 release branches are known to succeed.
 @end html
 @anchor{avr}
 @heading avr
-ATMEL AVR-family micro controllers.  These are used in embedded
+AVR 8-bit microcontrollers.  These are used in embedded
 applications.  There are no standard Unix configurations.
 @ifnothtml
 @xref{AVR Options,, AVR Options, gcc, Using the GNU Compiler