Add and rename a few fields and associations on schools