Renames measurement variables and updates calculations