Update a few variable names for better usability