3235: Fix attribute keys. refs #3235