Improved the names of variables.