More return proxy renames.