Merge "Rename intent to fix test." into main