Add keywords. Rename OBJECT_KEYS to OBJECT_NAME.