A few naming fixes