Renamed more variables