[WFLY-3258] Update remote naming
Merge pull request #6191 from dmlloyd/wfly-3258-remote-naming

[WFLY-3258] Update remote naming