Put core option names into proper namespace