Sonar Fixes: Variable name changes

Issue-ID: AAF-1040 Ticket for Sonar Fixes
Change-Id: I48b764c1c7b6993ce18e693cd16522afb1e1c21d
Signed-off-by: HelenaLydon <helena.lydon@est.tech>
18 files changed