Merge "Adjusting strings to match style guidelines" into main