Small variable naming fixes.