Fix remote & name