fix namespacing of factories