Rename bar, remove foo
