New namespacing

See bolt/bolt #1556