Address review comments.
Fix key name constants.