code review fixes

Rename bundled1 to bundled and bundled2 to basebundled.