CBLT-44: use unique names for targets

Change-Id: I8b51f469797f24d5c00e91ac356065a6e6d3400b