fix typos related to singleton variable.