refactor bundle keys
modify bundle type enum to match new config key names