diff --git a/macros b/macros
index d778275..b9dccf1 100644
--- a/macros
+++ b/macros
@@ -57,14 +57,14 @@
 # C compiler flags.  This is traditionally called CFLAGS in makefiles.
 # Historically also available as %%{optflags}, and %%build sets the
 # environment variable RPM_OPT_FLAGS to this value.
-%build_cflags %{optflags} %{?_pkg_extra_cflags}
+%build_cflags %{optflags} %{?_distro_extra_cflags}
 
 # C++ compiler flags.  This is traditionally called CXXFLAGS in makefiles.
-%build_cxxflags %{optflags} %{?_pkg_extra_cxxflags}
+%build_cxxflags %{optflags} %{?_distro_extra_cxxflags}
 
 # Fortran compiler flags.  Makefiles use both FFLAGS and FCFLAGS as
 # the corresponding variable names.
-%build_fflags %{optflags} -I%{_fmoddir} %{?_pkg_extra_fflags}
+%build_fflags %{optflags} -I%{_fmoddir} %{?_distro_extra_fflags}
 
 # Vala compiler flags. This is used to set VALAFLAGS.
 %build_valaflags -g
@@ -79,7 +79,7 @@
 # the flags, while intended for ld, are still passed through the gcc
 # compiler driver.  At the beginning of %%build, the environment
 # variable RPM_LD_FLAGS to this value.
-%build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags} %{_annotation_ldflags} %[ "%{toolchain}" == "clang" ? "%{?_clang_extra_ldflags}" : "" ] %{_build_id_flags} %{?_package_note_flags} %{?_pkg_extra_ldflags}
+%build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags} %{_annotation_ldflags} %[ "%{toolchain}" == "clang" ? "%{?_clang_extra_ldflags}" : "" ] %{_build_id_flags} %{?_package_note_flags} %{?_distro_extra_ldflags}
 
 # Expands to shell code to set the compiler/linker environment
 # variables CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, VALAFLAGS, LDFLAGS if they
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 82d0fd6..3dc603b 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -4,7 +4,7 @@
 # 2) When making changes, increment the version (in baserelease) by 1.
 #    rpmdev-bumpspec and other tools update the macro below, which is used
 #    in Version: to get the desired effect.
-%global baserelease 251
+%global baserelease 252
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
@@ -252,6 +252,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Tue Feb 28 2023 Tom Stellard <tstellar@redhat.com> - 252-1
+- Rename _pkg_extra_* macros to _distro_extra_*
+
 * Thu Feb 23 2023 Miro Hrončok <mhroncok@redhat.com> - 251-1
 - Drop the requirement of orphaned nim-srpm-macros
 - No Fedora package uses the %%nim_arches macro
diff --git a/tests/distro-extra-flags/main.fmf b/tests/distro-extra-flags/main.fmf
new file mode 100644
index 0000000..496e8c7
--- /dev/null
+++ b/tests/distro-extra-flags/main.fmf
@@ -0,0 +1,8 @@
+summary: >
+  Check that the %_distro_extra_* macros allow users to append new flags to the
+  list of default flags.
+
+require:
+  - rpm
+
+test: ./runtest.sh
diff --git a/tests/distro-extra-flags/runtest.sh b/tests/distro-extra-flags/runtest.sh
new file mode 100755
index 0000000..09105b0
--- /dev/null
+++ b/tests/distro-extra-flags/runtest.sh
@@ -0,0 +1,6 @@
+set -ex
+
+rpm -D '%_distro_extra_cflags -Wall' -E %{build_cflags} | grep -e '\-Wall$'
+rpm -D '%_distro_extra_cxxflags -Wall' -E %{build_cxxflags} | grep -e '\-Wall$'
+rpm -D '%_distro_extra_ldflags -Wall' -E %{build_ldflags} | grep -e '\-Wall$'
+rpm -D '%_distro_extra_fflags -Wall' -E %{build_fflags} | grep -e '\-Wall$'
diff --git a/tests/pkg-extra-flags/main.fmf b/tests/pkg-extra-flags/main.fmf
deleted file mode 100644
index 069fc6b..0000000
--- a/tests/pkg-extra-flags/main.fmf
+++ /dev/null
@@ -1,8 +0,0 @@
-summary: >
-  Check that the %_pkg_extra_* macros allow users to append new flags to the
-  list of default flags.
-
-require:
-  - rpm
-
-test: ./runtest.sh
diff --git a/tests/pkg-extra-flags/runtest.sh b/tests/pkg-extra-flags/runtest.sh
deleted file mode 100755
index 4d65044..0000000
--- a/tests/pkg-extra-flags/runtest.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -ex
-
-rpm -D '%_pkg_extra_cflags -Wall' -E %{build_cflags} | grep -e '\-Wall$'
-rpm -D '%_pkg_extra_cxxflags -Wall' -E %{build_cxxflags} | grep -e '\-Wall$'
-rpm -D '%_pkg_extra_ldflags -Wall' -E %{build_ldflags} | grep -e '\-Wall$'
-rpm -D '%_pkg_extra_fflags -Wall' -E %{build_fflags} | grep -e '\-Wall$'