Changes for options -- rename from 'CFG_*' to '*', changed dependences