Renamed stuff and made sure sonar is happy