Some naming fixes