Cleanup chapter 1: rename, renumber and deduplicate.