path & naming fixes