Variable naming fixes