--- a/dmpack.c	Thu Apr 18 00:01:50 2013 +0300
+++ b/dmpack.c	Sun Apr 21 16:40:45 2013 +0300
@@ -9,19 +9,19 @@
 #include <zlib.h>
 
 
-DMPackEntry *dm_pack_entry_new()
+DMPackEntry *dmPackEntryNew()
 {
     return (DMPackEntry *) dmMalloc0(sizeof(DMPackEntry));
 }
 
 
-void dm_pack_entry_free(DMPackEntry * node)
+void dmPackEntryFree(DMPackEntry * node)
 {
     dmFree(node);
 }
 
 
-void dm_pack_entry_insert(DMPackEntry ** packDir, DMPackEntry * node)
+void dmPackEntryInsert(DMPackEntry ** packDir, DMPackEntry * node)
 {
     if (*packDir != NULL)
     {
@@ -38,7 +38,7 @@
 }
 
 
-void dm_pack_entry_delete(DMPackEntry ** packDir, DMPackEntry * node)
+void dmPackEntryDelete(DMPackEntry ** packDir, DMPackEntry * node)
 {
     if (node->prev)
         node->prev->next = node->next;
@@ -52,7 +52,7 @@
 }
 
 
-DMPackEntry *dm_pack_find(DMPackEntry *list, const char *filename)
+DMPackEntry *dmPackFind(DMPackEntry *list, const char *filename)
 {
     DMPackEntry *node;
 
@@ -69,7 +69,7 @@
 /*
  * OPEN a packfile
  */
-int dm_pack_open(const char *filename, DMPackFile ** ppPack, BOOL readOnly)
+int dmPackOpen(const char *filename, DMPackFile ** ppPack, BOOL readOnly)
 {
     unsigned int i;
     DMPackFile *pack;
@@ -83,7 +83,7 @@
         return DMERR_MALLOC;
 
     // Open the file
-    pack->file = fopen(filename, (readOnly) ? "rb" : "r+b");
+    pack->file = fopen(filename, readOnly ? "rb" : "r+b");
     if (pack->file == NULL)
     {
         dmFree(pack);
@@ -99,38 +99,38 @@
         !dm_fread_le32(pack->file, &hdr.dirEntries) ||
         !dm_fread_le32(pack->file, &hdr.dirOffset))
     {
-        dm_pack_close(pack);
+        dmPackClose(pack);
         return DMERR_FREAD;
     }
 
     // Check information
     if (memcmp(&hdr.ident, DPACK_IDENT, sizeof(hdr.ident)) != 0)
     {
-        dm_pack_close(pack);
+        dmPackClose(pack);
         return DMERR_NOTPACK;
     }
 
     if (hdr.version != DPACK_VERSION)
     {
-        dm_pack_close(pack);
+        dmPackClose(pack);
         return DMERR_VERSION;
     }
 
     // Read directory
     if (fseek(pack->file, hdr.dirOffset, SEEK_SET) != 0)
     {
-        dm_pack_close(pack);
+        dmPackClose(pack);
         return DMERR_INVALID;
     }
 
     for (i = 0; i < hdr.dirEntries; i++)
     {
         // Allocate and read directory entry
-        DMPackEntry *entry = dm_pack_entry_new();
+        DMPackEntry *entry = dmPackEntryNew();
 
         if (entry == NULL)
         {
-            dm_pack_close(pack);
+            dmPackClose(pack);
             return DMERR_MALLOC;
         }
 
@@ -138,14 +138,14 @@
             !dm_fread_le32(pack->file, &entry->size) ||
             !dm_fread_le32(pack->file, &entry->offset) ||
             !dm_fread_le32(pack->file, &entry->length) ||
-            !dm_fread_le32(pack->file, &entry->resFlags))
+            !dm_fread_le32(pack->file, &entry->flags))
         {
             *ppPack = pack;
             return DMERR_FREAD;
         }
 
         // Insert into list
-        dm_pack_entry_insert(&pack->entries, entry);
+        dmPackEntryInsert(&pack->entries, entry);
     }
 
     // Set the result
@@ -157,9 +157,9 @@
 /*
  * CLOSE the packfile
  */
-int dm_pack_close(DMPackFile * pack)
+int dmPackClose(DMPackFile * pack)
 {
-    DMPackEntry *node, *next;
+    DMPackEntry *node;
 
     if (pack == NULL)
         return DMERR_OK;
@@ -168,8 +168,8 @@
     node = pack->entries;
     while (node != NULL)
     {
-        next = node->next;
-        dm_pack_entry_free(node);
+        DMPackEntry *next = node->next;
+        dmPackEntryFree(node);
         node = next;
     }