Finish namespacing models