Add bundle names missing 'Api' suffix