fixup conf prefixes

Change-Id: I1a0425605618447641ca81f217858650f7a97324