Removed obvious keyword from create_swid_tags and create_software_ids