Refactoring

Changes:
- Replaced all namespaces prefixed with "cb" with less verbose versions