Rename name to key, for consistent key/value naming.