Small variable name changes.