diff --git a/eclass/bintron.eclass b/eclass/bintron.eclass
index 087a60c..bbf0c40 100644
--- a/eclass/bintron.eclass
+++ b/eclass/bintron.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bintron.eclass
@@ -35,7 +35,7 @@ _BINTRON_LANGS="
 	sv sw ta te th tr uk vi zh-CN zh-TW
 "
 
-# @ECLASS-VARIABLE: BINTRON_LANGS
+# @ECLASS_VARIABLE: BINTRON_LANGS
 # @DESCRIPTION:
 # List of language packs available for this package.
 : ${BINTRON_LANGS:=${_BINTRON_LANGS}}
@@ -104,7 +104,7 @@ IUSE+=" +system-ffmpeg +system-vulkan "
 QA_PREBUILT='*'
 QA_PRESTRIPPED='*'
 
-# @ECLASS-VARIABLE: BINTRON_HOME
+# @ECLASS_VARIABLE: BINTRON_HOME
 # @DESCRIPTION:
 # Path where the package contents will we installed.
 : ${BINTRON_HOME:="/usr/share/${PN}/"}
diff --git a/eclass/cargo-git.eclass b/eclass/cargo-git.eclass
index fa6d932..9065a0e 100644
--- a/eclass/cargo-git.eclass
+++ b/eclass/cargo-git.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cargo-git.eclass
@@ -24,7 +24,7 @@ inherit cargo git-r3
 
 EXPORT_FUNCTIONS src_unpack
 
-# @ECLASS-VARIABLE: CARGO_GIT
+# @ECLASS_VARIABLE: CARGO_GIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array with the syntax "repourl oid identifier" (still not sure where the oid comes from :/)
diff --git a/eclass/gog.eclass b/eclass/gog.eclass
index 166ebe2..620d419 100644
--- a/eclass/gog.eclass
+++ b/eclass/gog.eclass
@@ -1,4 +1,4 @@
-# Copyright 2020-2020 Gentoo Foundation
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gog.eclass
@@ -19,24 +19,24 @@
 # In order to disable network-sandbox:
 PROPERTIES+="live"
 
-# @ECLASS-VARIABLE: GOG_GAME_NAME
+# @ECLASS_VARIABLE: GOG_GAME_NAME
 # @DESCRIPTION:
 # Name of the game as it appears in lgogdownloader list.
 : ${GOG_GAME_NAME:=}
 
-# @ECLASS-VARIABLE: GOG_GAME_L10N
+# @ECLASS_VARIABLE: GOG_GAME_L10N
 # @DESCRIPTION:
 # Languages available for the game.
 : ${GOG_GAME_L10N:=()}
 
-# @ECLASS-VARIABLE: GOG_GAME_PLATFORM
+# @ECLASS_VARIABLE: GOG_GAME_PLATFORM
 # @DESCRIPTION:
 # This choice specifies which binaries, for which platform, will be downloaded from GOG.
 # Sometimes, this can be irrelevant, as unofficial platform binaries may come from 3rd
 # party sources.
 : ${GOG_GAME_PLATFORM:=}
 
-# @ECLASS-VARIABLE: GOG_GAME_INSTALLER
+# @ECLASS_VARIABLE: GOG_GAME_INSTALLER
 # @DESCRIPTION:
 # Filename of the installer. There can be many, as some games support each language
 # through separate installers.
diff --git a/eclass/icecatconfig-v6.60.eclass b/eclass/icecatconfig-v6.60.eclass
index 5d314d2..d7f6644 100644
--- a/eclass/icecatconfig-v6.60.eclass
+++ b/eclass/icecatconfig-v6.60.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Foundation
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # @ECLASS: icecatconfig-v6.60.eclass
@@ -29,7 +29,7 @@ esac
 
 inherit flag-o-matic toolchain-funcs mozcoreconf-v6
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_WIFI
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # optional necko-wifi support via IUSE="wifi".  Currently this would include
@@ -39,7 +39,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v6
 # Set the variable to "enabled" if the use flag should be enabled by default.
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_JIT
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # deterministic jit support via IUSE="jit".  The upstream default will be used
@@ -49,7 +49,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v6
 # Set the variable to "enabled" if the use flag should be enabled by default.
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_GTK3
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk3 support via IUSE="force-gtk3".  Currently this would include
@@ -61,7 +61,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v6
 # If gtk+:3 is to be the standard toolkit, do not use this and instead use
 # MOZCONFIG_OPTIONAL_GTK2ONLY.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk2-only support via IUSE="gtk2".
diff --git a/eclass/icecatlinguas-v2.eclass b/eclass/icecatlinguas-v2.eclass
index a051102..9d3f564 100644
--- a/eclass/icecatlinguas-v2.eclass
+++ b/eclass/icecatlinguas-v2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Foundation
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: icecatlinguas-v2.eclass
@@ -24,60 +24,60 @@ case "${EAPI:-0}" in
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers";;
 esac
 
-# @ECLASS-VARIABLE: MOZ_LANGS
+# @ECLASS_VARIABLE: MOZ_LANGS
 # @DESCRIPTION:
 # Array containing the list of language pack xpis available for
 # this release. The list can be updated with scripts/get_langs.sh from the
 # mozilla overlay.
 : ${MOZ_LANGS:=()}
 
-# @ECLASS-VARIABLE: MOZ_PV
+# @ECLASS_VARIABLE: MOZ_PV
 # @DESCRIPTION:
 # Ebuild package version converted to equivalent upstream version.
 # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
 : ${MOZ_PV:="${PV}"}
 
-# @ECLASS-VARIABLE: MOZ_PN
+# @ECLASS_VARIABLE: MOZ_PN
 # @DESCRIPTION:
 # Ebuild package name converted to equivalent upstream name.
 # Defaults to ${PN}, and should be overridden for binary ebuilds.
 : ${MOZ_PN:="${PN}"}
 
-# @ECLASS-VARIABLE: MOZ_P
+# @ECLASS_VARIABLE: MOZ_P
 # @DESCRIPTION:
 # Ebuild package name + version converted to upstream equivalent.
 # Defaults to ${MOZ_PN}-${MOZ_PV}
 : ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
 
-# @ECLASS-VARIABLE: MOZ_FTP_URI
+# @ECLASS_VARIABLE: MOZ_FTP_URI
 # @DESCRIPTION:
 # The ftp URI prefix for the release tarballs and language packs.
 : ${MOZ_FTP_URI:=""}
 
-# @ECLASS-VARIABLE: MOZ_HTTP_URI
+# @ECLASS_VARIABLE: MOZ_HTTP_URI
 # @DESCRIPTION:
 # The http URI prefix for the release tarballs and language packs.
 : ${MOZ_HTTP_URI:=""}
 
-# @ECLASS-VARIABLE: MOZ_LANGPACK_HTTP_URI
+# @ECLASS_VARIABLE: MOZ_LANGPACK_HTTP_URI
 # @DESCRIPTION:
 # An alternative http URI if it differs from official mozilla URI.
 # Defaults to whatever MOZ_HTTP_URI was set to.
 : ${MOZ_LANGPACK_HTTP_URI:=${MOZ_HTTP_URI}}
 
-# @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX
+# @ECLASS_VARIABLE: MOZ_LANGPACK_PREFIX
 # @DESCRIPTION:
 # The relative path till the lang code in the langpack file URI.
 # Defaults to ${MOZ_PV}/langpacks
 : ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/langpacks/${MOZ_P}."}
 
-# @ECLASS-VARIABLE: MOZ_LANGPACK_SUFFIX
+# @ECLASS_VARIABLE: MOZ_LANGPACK_SUFFIX
 # @DESCRIPTION:
 # The suffix after the lang code in the langpack file URI.
 # Defaults to '.xpi'
 : ${MOZ_LANGPACK_SUFFIX:=".langpack.xpi"}
 
-# @ECLASS-VARIABLE: MOZ_LANGPACK_UNOFFICIAL
+# @ECLASS_VARIABLE: MOZ_LANGPACK_UNOFFICIAL
 # @DESCRIPTION:
 # The status of the langpack, used to differentiate within
 # Manifests and on Gentoo mirrors as to when the langpacks are
@@ -87,7 +87,7 @@ esac
 # suffix.
 : ${MOZ_LANGPACK_UNOFFICIAL:=""}
 
-# @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS
+# @ECLASS_VARIABLE: MOZ_GENERATE_LANGPACKS
 # @DESCRIPTION:
 # This flag specifies whether or not the langpacks should be
 # generated directly during the build process, rather than
@@ -96,13 +96,13 @@ esac
 # Defaults to empty.
 : ${MOZ_GENERATE_LANGPACKS:=""}
 
-# @ECLASS-VARIABLE: MOZ_L10N_SOURCEDIR
+# @ECLASS_VARIABLE: MOZ_L10N_SOURCEDIR
 # @DESCRIPTION:
 # The path that l10n sources can be found at, once unpacked.
 # Defaults to ${WORKDIR}/l10n-sources
 : ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"}
 
-# @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX
+# @ECLASS_VARIABLE: MOZ_L10N_URI_PREFIX
 # @DESCRIPTION:
 # The full URI prefix of the distfile for each l10n locale.  The
 # AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the
@@ -111,25 +111,25 @@ esac
 # Defaults to empty.
 : ${MOZ_L10N_URI_PREFIX:=""}
 
-# @ECLASS-VARIABLE: MOZ_L10N_URI_SUFFIX
+# @ECLASS_VARIABLE: MOZ_L10N_URI_SUFFIX
 # @DESCRIPTION:
 # The suffix of l10n source distfiles.
 # Defaults to '.tar.xz'
 : ${MOZ_L10N_URI_SUFFIX:=".tar.xz"}
 
-# @ECLASS-VARIABLE: MOZ_FORCE_UPSTREAM_L10N
+# @ECLASS_VARIABLE: MOZ_FORCE_UPSTREAM_L10N
 # @DESCRIPTION:
 # Set this to use upstream langpaks even if the package normally
 # shouldn't (ie it is an alpha or beta package)
 : ${MOZ_FORCE_UPSTREAM_L10N:=""}
 
-# @ECLASS-VARIABLE: MOZ_TOO_REGIONALIZED_FOR_L10N
+# @ECLASS_VARIABLE: MOZ_TOO_REGIONALIZED_FOR_L10N
 # @INTERNAL
 # @DESCRIPTION:
 # Upstream identifiers that should not contain region subtags in L10N
 MOZ_TOO_REGIONALIZED_FOR_L10N=( fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO nn-NO pa-IN sv-SE )
 
-# @ECLASS-VARIABLE: MOZ_INSTALL_L10N_XPIFILE
+# @ECLASS_VARIABLE: MOZ_INSTALL_L10N_XPIFILE
 # @DESCRIPTION:
 # Install langpacks as .xpi file instead of unpacked directory.
 # Leave unset to install unpacked
diff --git a/eclass/kernel-2-src-prepare-overlay.eclass b/eclass/kernel-2-src-prepare-overlay.eclass
index b8e9f3c..5f5299b 100644
--- a/eclass/kernel-2-src-prepare-overlay.eclass
+++ b/eclass/kernel-2-src-prepare-overlay.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kernel-2-src-prepare-overlay.eclass
@@ -17,7 +17,7 @@
 # added functionality:
 # unipatch		- a flexible, singular method to extract, add and remove patches.
 
-# @ECLASS-VARIABLE: K_USEPV
+# @ECLASS_VARIABLE: K_USEPV
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # When setting the EXTRAVERSION variable, it should
@@ -25,32 +25,32 @@
 # this is useful for things like wolk. IE:
 # EXTRAVERSION would be something like : -wolk-4.19-r1
 
-# @ECLASS-VARIABLE:  K_NODRYRUN
+# @ECLASS_VARIABLE:  K_NODRYRUN
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set then patch --dry-run will not
 # be run. Certain patches will fail with this parameter
 # See bug #507656
 
-# @ECLASS-VARIABLE:  K_NOSETEXTRAVERSION
+# @ECLASS_VARIABLE:  K_NOSETEXTRAVERSION
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set then EXTRAVERSION will not be
 # automatically set within the kernel Makefile
 
-# @ECLASS-VARIABLE: K_NOUSENAME
+# @ECLASS_VARIABLE: K_NOUSENAME
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set then EXTRAVERSION will not include the
 # first part of ${PN} in EXTRAVERSION
 
-# @ECLASS-VARIABLE: K_NOUSEPR
+# @ECLASS_VARIABLE: K_NOUSEPR
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set then EXTRAVERSION will not include the
 # anything based on ${PR}.
 
-# @ECLASS-VARIABLE: K_PREPATCHED
+# @ECLASS_VARIABLE: K_PREPATCHED
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if the patchset is prepatched (ie: pf-sources,
@@ -58,123 +58,123 @@
 # patchset version for and not use it as a true package
 # revision
 
-# @ECLASS-VARIABLE:  K_EXTRAEINFO
+# @ECLASS_VARIABLE:  K_EXTRAEINFO
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # this is a new-line seperated list of einfo displays in
 # postinst and can be used to carry additional postinst
 # messages
 
-# @ECLASS-VARIABLE:  K_EXTRAELOG
+# @ECLASS_VARIABLE:  K_EXTRAELOG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # same as K_EXTRAEINFO except using elog instead of einfo
 
-# @ECLASS-VARIABLE:  K_EXTRAEWARN
+# @ECLASS_VARIABLE:  K_EXTRAEWARN
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # same as K_EXTRAEINFO except using ewarn instead of einfo
 
-# @ECLASS-VARIABLE:  K_SYMLINK
+# @ECLASS_VARIABLE:  K_SYMLINK
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set, then forcably create symlink anyway
 
-# @ECLASS-VARIABLE:  K_BASE_VER
+# @ECLASS_VARIABLE:  K_BASE_VER
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # for git-sources, declare the base version this patch is
 # based off of.
 
-# @ECLASS-VARIABLE:  K_DEFCONFIG
+# @ECLASS_VARIABLE:  K_DEFCONFIG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Allow specifying a different defconfig target.
 # If length zero, defaults to "defconfig".
 
-# @ECLASS-VARIABLE:  K_WANT_GENPATCHES
+# @ECLASS_VARIABLE:  K_WANT_GENPATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Apply genpatches to kernel source. Provide any
 # combination of "base", "extras" or "experimental".
 
-# @ECLASS-VARIABLE:  K_EXP_GENPATCHES_PULL
+# @ECLASS_VARIABLE:  K_EXP_GENPATCHES_PULL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, we pull "experimental" regardless of the USE FLAG
 # but expect the ebuild maintainer to use K_EXP_GENPATCHES_LIST.
 
-# @ECLASS-VARIABLE:  K_EXP_GENPATCHES_NOUSE
+# @ECLASS_VARIABLE:  K_EXP_GENPATCHES_NOUSE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, no USE flag will be provided for "experimental";
 # as a result the user cannot choose to apply those patches.
 
-# @ECLASS-VARIABLE:  K_EXP_GENPATCHES_LIST
+# @ECLASS_VARIABLE:  K_EXP_GENPATCHES_LIST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # A list of patches to pick from "experimental" to apply when
 # the USE flag is unset and K_EXP_GENPATCHES_PULL is set.
 
-# @ECLASS-VARIABLE:  K_FROM_GIT
+# @ECLASS_VARIABLE:  K_FROM_GIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, this variable signals that the kernel sources derives
 # from a git tree and special handling will be applied so that
 # any patches that are applied will actually apply.
 
-# @ECLASS-VARIABLE:  K_GENPATCHES_VER
+# @ECLASS_VARIABLE:  K_GENPATCHES_VER
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The version of the genpatches tarball(s) to apply.
 # A value of "5" would apply genpatches-2.6.12-5 to
 # my-sources-2.6.12.ebuild
 
-# @ECLASS-VARIABLE:  K_SECURITY_UNSUPPORTED
+# @ECLASS_VARIABLE:  K_SECURITY_UNSUPPORTED
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, this kernel is unsupported by Gentoo Security
 # to the current eclass maintainer :)
 
-# @ECLASS-VARIABLE:  K_DEBLOB_AVAILABLE
+# @ECLASS_VARIABLE:  K_DEBLOB_AVAILABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # A value of "0" will disable all of the optional deblob
 # code. If empty, will be set to "1" if deblobbing is
 # possible. Test ONLY for "1".
 
-# @ECLASS-VARIABLE:  K_DEBLOB_TAG
+# @ECLASS_VARIABLE:  K_DEBLOB_TAG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # This will be the version of deblob script. It's a upstream SVN tag
 # such asw -gnu or -gnu1.
 
-# @ECLASS-VARIABLE:  K_PREDEBLOBBED
+# @ECLASS_VARIABLE:  K_PREDEBLOBBED
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # This kernel was already deblobbed elsewhere.
 # If false, either optional deblobbing will be available
 # or the license will note the inclusion of linux-firmware code.
 
-# @ECLASS-VARIABLE:  K_LONGTERM
+# @ECLASS_VARIABLE:  K_LONGTERM
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, the eclass will search for the kernel source
 # in the long term directories on the upstream servers
 # as the location has been changed by upstream
 
-# @ECLASS-VARIABLE:  H_SUPPORTEDARCH
+# @ECLASS_VARIABLE:  H_SUPPORTEDARCH
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # this should be a space separated list of ARCH's which
 # can be supported by the headers ebuild
 
-# @ECLASS-VARIABLE:  UNIPATCH_LIST
+# @ECLASS_VARIABLE:  UNIPATCH_LIST
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # space delimetered list of patches to be applied to the kernel
 
-# @ECLASS-VARIABLE:  UNIPATCH_EXCLUDE
+# @ECLASS_VARIABLE:  UNIPATCH_EXCLUDE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # An addition var to support exlusion based completely
@@ -182,13 +182,13 @@
 # this should _NOT_ be used from the ebuild as this is
 # reserved for end users passing excludes from the cli
 
-# @ECLASS-VARIABLE:  UNIPATCH_DOCS
+# @ECLASS_VARIABLE:  UNIPATCH_DOCS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # space delimemeted list of docs to be installed to
 # the doc dir
 
-# @ECLASS-VARIABLE:  UNIPATCH_STRICTORDER
+# @ECLASS_VARIABLE:  UNIPATCH_STRICTORDER
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # if this is set places patches into directories of
diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass
index be0d2bb..1aa92b2 100644
--- a/eclass/mozconfig-v6.56.eclass
+++ b/eclass/mozconfig-v6.56.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # @ECLASS: mozconfig-v6.55.eclass
@@ -34,7 +34,7 @@ case ${PN} in
 	(*) die "Don't use this eclass with some other package!" ;;
 esac
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_WIFI
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # optional necko-wifi support via IUSE="wifi".  Currently this would include
@@ -44,7 +44,7 @@ esac
 # Set the variable to "enabled" if the use flag should be enabled by default.
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_JIT
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild needs to provide
 # deterministic jit support via IUSE="jit".  The upstream default will be used
@@ -54,7 +54,7 @@ esac
 # Set the variable to "enabled" if the use flag should be enabled by default.
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_GTK3
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk3 support via IUSE="force-gtk3".  Currently this would include
@@ -66,7 +66,7 @@ esac
 # If gtk+:3 is to be the standard toolkit, do not use this and instead use
 # MOZCONFIG_OPTIONAL_GTK2ONLY.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional gtk2-only support via IUSE="gtk2".
@@ -79,7 +79,7 @@ esac
 # Set the variable to "enabled" if the use flag should be enabled by default.
 # Set the variable to any value if the use flag should exist but not be default-enabled.
 
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
+# @ECLASS_VARIABLE: MOZCONFIG_OPTIONAL_QT5
 # @DESCRIPTION:
 # Set this variable before the inherit line, when an ebuild can provide
 # optional qt5 support via IUSE="qt5".  Currently this would include
diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass
index 4f2c853..da164f2 100644
--- a/eclass/mozcoreconf-v5.eclass
+++ b/eclass/mozcoreconf-v5.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # @ECLASS: mozcoreconf-v5.eclass
@@ -9,7 +9,7 @@
 #
 # inherit mozconfig-v6.* or above for mozilla configuration support
 
-# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME
+# @ECLASS_VARIABLE: MOZILLA_FIVE_HOME
 # @DESCRIPTION:
 # This is an eclass-generated variable that defines the rpath that the mozilla
 # product will be installed in.  Read-only
diff --git a/eclass/wise.eclass b/eclass/wise.eclass
index 28db1c0..a2f4a32 100644
--- a/eclass/wise.eclass
+++ b/eclass/wise.eclass
@@ -1,4 +1,4 @@
-# Copyright 2021-2021 Gentoo Foundation
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wise.eclass
@@ -23,7 +23,7 @@
 # In order to disable network-sandbox:
 PROPERTIES+="live"
 
-# @ECLASS-VARIABLE: WISE_INSTALLER
+# @ECLASS_VARIABLE: WISE_INSTALLER
 # @DESCRIPTION:
 # WISE installer filename. It can be an array!
 : ${WISE_INSTALLER:=}