Migrated body namespace to top level