This patch unifies the use of config options in v2 to all start with CONFIG_