Weaver builders namespace change