Rename to more appropriate keys