undo another accidential rename of X -> CONFIG_X (trivial)