+ Renamed variables after domain/range refactoring