naming changes. bundles added, need 2 check matches defs