Reference proper resource name

Change-Id: I38074bb1e51899e450c7cf820ea753cf9161f82c
Use None rather than empty for default config/pass

Change-Id: I54dcb512a7f8db395896007d4d7fade2a6db3d05