Change core options namespace