Renaming to match local/remote convention