Change to Bdt namespace