Small path and naming fixes