making more changes for namespacing in the generators