Using more standard key names.