fdo#62947 make IDs unique, fixes, better names

Change-Id: I6cbfd43f037fe89e0f753c67c9368b981b85bd35