Clean up of key block functions

No substantial new code, just making the old code consistent.

Review URL: http://codereview.chromium.org/2729021
diff --git a/vboot_firmware/lib/vboot_kernel.c b/vboot_firmware/lib/vboot_kernel.c
index bcf9e17..ca8ba99 100644
--- a/vboot_firmware/lib/vboot_kernel.c
+++ b/vboot_firmware/lib/vboot_kernel.c
@@ -92,7 +92,7 @@
 
       /* Verify the key block */
       key_block = (VbKeyBlockHeader*)kbuf;
-      if ((0 != VerifyKeyBlock(key_block, KBUF_SIZE, kernel_subkey)))
+      if ((0 != KeyBlockVerify(key_block, KBUF_SIZE, kernel_subkey)))
         continue;
 
       /* Check the key block flags against the current boot mode */