Removed unused 'type' choice key and changed to lowercase for config key names