Rename 'Bundled' to 'Unbundled'
Rename lifted operators