diff --git a/python-pbr.changes b/python-pbr.changes
index bb6df69..fedaabf 100644
--- a/python-pbr.changes
+++ b/python-pbr.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 27 15:24:52 UTC 2018 - tchvatal@suse.com
+
+- Move the Name declaration above BR with LUA expansion as it won't
+  get expanded in time for older codestreams otherwise and result
+  in issue like "Package does not exist: %files -n python-%name"
+
 -------------------------------------------------------------------
 Wed Aug 15 12:38:40 UTC 2018 - mcepl@suse.com
 
diff --git a/python-pbr.spec b/python-pbr.spec
index 4f6df42..9bbda18 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -23,7 +23,11 @@
 %else
 %bcond_with test
 %endif
-
+%if !%{with test}
+Name:           python-pbr
+%else
+Name:           python-pbr-%{flavor}
+%endif
 Version:        4.1.1
 Release:        0
 Summary:        Python Build Reasonableness
@@ -39,11 +43,6 @@ Requires(post): update-alternatives
 Requires(postun): update-alternatives
 Obsoletes:      python-pbr-doc
 BuildArch:      noarch
-%if !%{with test}
-Name:           python-pbr
-%else
-Name:           python-pbr-%{flavor}
-%endif
 %if %{with test}
 BuildRequires:  %{python_module Sphinx >= 1.6.2}
 BuildRequires:  %{python_module devel}