FIX Provider's buses names
Some refactoring