BAP-2818: Create bundle for training
- refactor names