RTF-1338 unified places where repo names are
RTF-1338 ammends suggested in code review
RTF-1338 return to improve legibility