diff --git a/installation-images.spec b/installation-images.spec
index 4459052..44fccd5 100644
--- a/installation-images.spec
+++ b/installation-images.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package installation-images
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,22 +29,31 @@
 # ===  sort out branding  ===
 %if 0%{?is_opensuse}
 %define theme openSUSE
-%define branding openSUSE
-%define branding2 openSUSE
+%define branding_skelcd   openSUSE
+%define branding_systemd  openSUSE
+%define branding_plymouth openSUSE
+%define branding_grub2    openSUSE
+%define branding_gfxboot  openSUSE
 BuildRequires:  openSUSE-release
 BuildRequires:  xf86-input-libinput
 %else
 %if 0%{?is_susecasp}
-%define theme CASP
-%define branding SLE
-%define branding2 CASP
+%define theme CAASP
+%define branding_skelcd   CASP
+%define branding_systemd  CAASP
+%define branding_plymouth SLE
+%define branding_grub2    SLE
+%define branding_gfxboot  SLE
 %define config_bootmenu_no_upgrade 1
 BuildRequires:  caasp-release
 BuildRequires:  caasp-release-DVD
 %else
 %define theme SLES
-%define branding SLE
-%define branding2 SLES
+%define branding_skelcd   SLES
+%define branding_systemd  SLE
+%define branding_plymouth SLE
+%define branding_grub2    SLE
+%define branding_gfxboot  SLE
 BuildRequires:  sle12-desktop-migration
 BuildRequires:  sles-release
 %ifarch x86_64 ppc64le
@@ -53,16 +62,16 @@ BuildRequires:  sap-installation-wizard
 %endif
 %endif
 
-BuildRequires:  skelcd-control-%branding2
-BuildRequires:  systemd-presets-branding-%branding
+BuildRequires:  skelcd-control-%branding_skelcd
+BuildRequires:  systemd-presets-branding-%branding_systemd
 %if %with_plymouth
-BuildRequires:  plymouth-branding-%branding
+BuildRequires:  plymouth-branding-%branding_plymouth
 %endif
 %ifarch %ix86 x86_64
-BuildRequires:  gfxboot-branding-%branding
+BuildRequires:  gfxboot-branding-%branding_gfxboot
 %endif
 %ifarch %ix86 x86_64 aarch64
-BuildRequires:  grub2-branding-%branding
+BuildRequires:  grub2-branding-%branding_grub2
 %endif
 # ===  branding end  ===