Update variable names to better reflect objects