Rename and move 17 and 20