patching to work with new organization and naming scheme