Update variable names and fix typo.