Fix naming/remote mistakes