Update target names, so that targets can be identified, and the
correct configurations are used when using the ramparser.

Change-Id: I254c65662943dd43f99fb12d22f1a17bc9f01283