Index: trunk/src/common.c
===================================================================
--- trunk/src/common.c	(revision 199)
+++ trunk/src/common.c	(revision 203)
@@ -320,5 +320,5 @@
 
 
-static char* get_quoted_keyname(const REGFI_NK_REC* nk)
+static char* get_quoted_keyname(const REGFI_NK* nk)
 {
   char* ret_val;
@@ -333,5 +333,5 @@
 
 
-static char* get_quoted_valuename(const REGFI_VK_REC* vk)
+static char* get_quoted_valuename(const REGFI_VK* vk)
 {
   char* ret_val;
Index: trunk/src/reglookup-recover.c
===================================================================
--- trunk/src/reglookup-recover.c	(revision 199)
+++ trunk/src/reglookup-recover.c	(revision 203)
@@ -67,5 +67,5 @@
 
 /* XXX: Somewhere in here, need to start looking for and handling classnames */
-void printKey(REGFI_FILE* f, REGFI_NK_REC* nk, const char* prefix)
+void printKey(REGFI_FILE* f, REGFI_NK* nk, const char* prefix)
 {
   char mtime[24];
@@ -103,5 +103,5 @@
 
 
-void printValue(REGFI_FILE* f, REGFI_VK_REC* vk, const char* prefix)
+void printValue(REGFI_FILE* f, REGFI_VK* vk, const char* prefix)
 {
   char* quoted_value = NULL;
@@ -181,5 +181,5 @@
 
 
-void printSK(REGFI_FILE* f, REGFI_SK_REC* sk)
+void printSK(REGFI_FILE* f, REGFI_SK* sk)
 {
   char* quoted_raw = NULL;
@@ -246,8 +246,8 @@
  *      repeatedly.  Should try to add caching.
  */
-char* getParentPath(REGFI_FILE* f, REGFI_NK_REC* nk)
+char* getParentPath(REGFI_FILE* f, REGFI_NK* nk)
 {
   void_stack* path_stack = void_stack_new(REGFI_MAX_DEPTH);
-  REGFI_NK_REC* cur_ancestor;
+  REGFI_NK* cur_ancestor;
   char* ret_val;
   uint32_t virt_offset, i, stack_size, ret_val_size, ret_val_used, offset;
@@ -410,5 +410,5 @@
 {
   const range_list_element* cur_elem;
-  REGFI_VK_REC* vk;
+  REGFI_VK* vk;
   uint32_t i, j;
 
@@ -453,5 +453,5 @@
 {
   const range_list_element* cur_elem;
-  REGFI_VK_REC* vk;
+  REGFI_VK* vk;
   range_list* bd_cells;
   REGFI_BUFFER data;
@@ -469,5 +469,5 @@
   {
     cur_elem = range_list_get(unalloc_values, i);
-    vk = (REGFI_VK_REC*)cur_elem->data;
+    vk = (REGFI_VK*)cur_elem->data;
     if(vk == NULL)
       return 11;
@@ -588,5 +588,5 @@
 {
   const range_list_element* cur_elem;
-  REGFI_NK_REC* key;
+  REGFI_NK* key;
   uint32_t i, j;
   int error_code = 0;
@@ -640,6 +640,6 @@
 		      range_list* unalloc_linked_values)
 {
-  REGFI_NK_REC* nk;
-  REGFI_VK_REC* vk;
+  REGFI_NK* nk;
+  REGFI_VK* vk;
   const range_list_element* cur_elem;
   uint32_t i, j, num_keys, off, values_length;
@@ -732,5 +732,5 @@
 {
   const range_list_element* cur_elem;
-  REGFI_SK_REC* sk;
+  REGFI_SK* sk;
   uint32_t i, j;
 
@@ -782,6 +782,6 @@
   char* tmp_name;
   char* tmp_path;
-  REGFI_NK_REC* tmp_key;
-  REGFI_VK_REC* tmp_value;
+  REGFI_NK* tmp_key;
+  REGFI_VK* tmp_value;
   uint32_t argi, arge, i, j, ret, num_unalloc_keys;
   int fd;
@@ -922,5 +922,5 @@
   {
     cur_elem = range_list_get(unalloc_keys, i);
-    tmp_key = (REGFI_NK_REC*)cur_elem->data;
+    tmp_key = (REGFI_NK*)cur_elem->data;
 
     if(tmp_key == NULL)
@@ -936,5 +936,5 @@
   {
     cur_elem = range_list_get(unalloc_keys, i);
-    tmp_key = (REGFI_NK_REC*)cur_elem->data;
+    tmp_key = (REGFI_NK*)cur_elem->data;
 
     printKey(f, tmp_key, parent_paths[i]);
@@ -956,7 +956,7 @@
       {
 	tmp_value = 
-	  (REGFI_VK_REC*)range_list_find_data(unalloc_linked_values, 
-					      tmp_key->values->elements[j]
-					      + REGFI_REGF_SIZE);
+	  (REGFI_VK*)range_list_find_data(unalloc_linked_values, 
+					  tmp_key->values->elements[j]
+					  + REGFI_REGF_SIZE);
 	if(tmp_value != NULL)
 	  printValue(f, tmp_value, tmp_path);
@@ -973,5 +973,5 @@
   {
     cur_elem = range_list_get(unalloc_values, i);
-    tmp_value = (REGFI_VK_REC*)cur_elem->data; 
+    tmp_value = (REGFI_VK*)cur_elem->data; 
 
     printValue(f, tmp_value, "");
Index: trunk/src/reglookup.c
===================================================================
--- trunk/src/reglookup.c	(revision 199)
+++ trunk/src/reglookup.c	(revision 203)
@@ -52,5 +52,5 @@
 
 
-void printValue(REGFI_ITERATOR* iter, const REGFI_VK_REC* vk, char* prefix)
+void printValue(REGFI_ITERATOR* iter, const REGFI_VK* vk, char* prefix)
 {
   const REGFI_DATA* data;
@@ -205,5 +205,5 @@
 {
   const REGFI_ITER_POSITION* cur;
-  const REGFI_NK_REC* tmp_key;
+  const REGFI_NK* tmp_key;
   uint32_t buf_left = 127;
   uint32_t buf_len = buf_left+1;
@@ -275,5 +275,5 @@
 void printValueList(REGFI_ITERATOR* iter, char* prefix)
 {
-  const REGFI_VK_REC* value;
+  const REGFI_VK* value;
 
   regfi_iterator_first_value(iter);
@@ -298,6 +298,6 @@
   char mtime[24];
   char* quoted_classname;
-  const REGFI_SK_REC* sk;
-  const REGFI_NK_REC* key = regfi_iterator_cur_key(iter);
+  const REGFI_SK* sk;
+  const REGFI_NK* key = regfi_iterator_cur_key(iter);
   const REGFI_CLASSNAME* classname;
 
@@ -371,7 +371,7 @@
 void printKeyTree(REGFI_ITERATOR* iter)
 {
-  const REGFI_NK_REC* root = NULL;
-  const REGFI_NK_REC* cur = NULL;
-  const REGFI_NK_REC* sub = NULL;
+  const REGFI_NK* root = NULL;
+  const REGFI_NK* cur = NULL;
+  const REGFI_NK* sub = NULL;
   char* path = NULL;
   int key_type = regfi_type_str2val("KEY");
@@ -460,5 +460,5 @@
 int retrievePath(REGFI_ITERATOR* iter, char** path)
 {
-  const REGFI_VK_REC* value;
+  const REGFI_VK* value;
   char* tmp_path_joined;
   const char** tmp_path;
