Fixing the namespaces. BuiltInTranslationTest still fails
Fixed merge conflicts. All tests pass.