diff --git a/coreutils.spec b/coreutils.spec
index 2b93e66..b6276d6 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -21,16 +21,15 @@
 # there are more fancy ways to define a package name using magic
 # macros but OBS and the bots that rely on parser information from
 # OBS can't deal with all of them
-%if "@BUILD_FLAVOR@" == ""
-%define name coreutils
-%else
-%define name coreutils-@BUILD_FLAVOR@
+%define flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" != ""
+%define name_suffix -%{flavor}
 %if %{with ringdisabled}
 ExclusiveArch:  do_not_build
 %endif
 %endif
 
-Name:           %name
+Name:           coreutils%{?name_suffix} 
 Summary:        GNU Core Utilities
 License:        GPL-3.0-or-later
 Group:          System/Base