MB-6972:  fix repo filenames

Change-Id: Ia7cbc10d00e01f58fe8b0207b248b61ce24124da