Rename Foo -> Resolver