added name & key to setting for better display and easier lookup