Rename variable and update comments