Re-work chapter labels