Change name, clean up chapter 4 - vlan