Changed names/variables to match