correct old name references
Merge branch 'feature-6-only-bundle'