Lets do that when we move to Sabre 1.8 which also uses namespacing.