Change name, use only one file for chapter 6