Rename, standardize GetSubTypeForBundle -> BundleGetSubType