These are executable names, not target names

Change-Id: Ib0acbd47d141a82013d5b9019bc148ec7570143b
Merge topic 'exe-name' into master

1ae0d854 These are executable names, not target names