correct more remote names

Change-Id: I232505f015280c5da8a01f55c11197db691245be