Renamed variables+function