Update variable names, and remove inventory checking from setInventoryContents