Renaming variables- issues identified by sonarQube