Renamed some variables
Updated some inverse relationships