Several texture and naming fixes