Rename some entities
Add comments to the top level objects