Renamed all references to local/remote and very happy