Migrate tree generators to use default key and index names