Name the config variables for the new type properly

Change-Id: I70165407c36ef82f0655d6387cce04e5e056b981