We decided to go for a real refactoring to cleanup naming in the bundle and make it easier to understand.

This milestone is to collect all issues and pull requests specifically for this refactoring.