Polishing
Fixed  typos

Issue: SPR-11232
Issue: SPR-11242