Renamed some vars for sonar