More variable name updates