- renamed plural to singular attributes for constraint blocks
- spelled out attribute names in resource maintenance blocks