More renamings to match the new repository terminology.