Rename conflicting and dcs_* bundles and bodies