remove BBC namespace and complete renaming