Renamed misleading variable names