Fix bad NV names after criss-crossed merges
Fix bad NV names after criss-crossed merges

A couple of commits merged cleanly independently but now
fail to compile

Change-Id: I594c3f098abf049fddd89fc2ecdfd5753df77deb
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22054
Tested-by: Jenkins Server
Reviewed-by: Stephen M. Cprek <449c81c8ca240ee26e6e5e8e94a7cb83f7b02ee8@us.ibm.com>
Reviewed-by: Daniel M. Crowell <912029ca9254ac7b5854e56910561d682e1fa2d0@us.ibm.com>

open-power/hostboot,open-power/hostboot,open-power/hostboot,open-power/hostboot,open-power/hostboot