Rename issue (part A)
Rename issue (part B)