Adjust the keys to more accurately describe their content.