Put core options into proper namespace