issue: 350325 few small typo's, param renaming & alignments

Change-Id: I1829af02e5b8920d1982db0308f8aeeba83a0c0a