There are some subtle naming differences between Fedora and openSUSE, adjust. Change-Id: I286e656ad980443abe0d578e9390c2a989cfdee7
Change-Id: I90fcb217e39ac5ef9d5e821a9dd59a1283419843