Renamed universalRift to toRift, and added fromRift where it is defined based on grift