Rename chapters
Update argument structure