Added a name field to Bool and Type.