Refractor BB for proper namespacing.