Restore and ToolBelt namespacing