Update chapter 2, much work on 'namespace'.