Add deconfigs in with Vanir naming scheme

Change-Id: I0c5ce3293caf8b9430e797b82dd425b79ef465a7