variable naming fixes