Fixes to naming of targets