--- a/dmengine.c	Thu Apr 18 00:01:50 2013 +0300
+++ b/dmengine.c	Sun Apr 21 16:40:45 2013 +0300
@@ -113,7 +113,7 @@
     SDL_Surface *img = dmLoadImage(res);
     if (res != NULL)
     {
-        res->rdata = img;
+        res->resData = img;
         return DMERR_OK;
     }
     else
@@ -123,7 +123,7 @@
 
 static void engineResImageFree(DMResource *res)
 {
-    SDL_FreeSurface((SDL_Surface *)res->rdata);
+    SDL_FreeSurface((SDL_Surface *)res->resData);
 }
 
 static BOOL engineResImageProbe(DMResource *res, const char *fext)
@@ -136,12 +136,12 @@
 #ifdef JSS_SUP_XM
 static int engineResModuleLoad(DMResource *res)
 {
-    return jssLoadXM(res, (JSSModule **) &(res->rdata));
+    return jssLoadXM(res, (JSSModule **) &(res->resData));
 }
 
 static void engineResModuleFree(DMResource *res)
 {
-    jssFreeModule((JSSModule *) res->rdata);
+    jssFreeModule((JSSModule *) res->resData);
 }
 
 static BOOL engineResModuleProbe(DMResource *res, const char *fext)
@@ -188,23 +188,23 @@
     OggVorbis_File vf;
 
     dmMsg(1, "vorbisfile '%s', %d bytes resource loading\n",
-        res->filename, res->dataSize);
+        res->filename, res->rawSize);
 
     if (ov_open_callbacks(res, &vf, NULL, 0, vorbisFileCBS) < 0)
         return DMERR_FOPEN;
 
-    res->rdataSize = ov_pcm_total(&vf, -1) * 2 * 2;
-    if ((res->rdata = dmMalloc(res->rdataSize + 16)) == NULL)
+    res->resSize = ov_pcm_total(&vf, -1) * 2 * 2;
+    if ((res->resData = dmMalloc(res->resSize + 16)) == NULL)
     {
         ov_clear(&vf);
         return DMERR_MALLOC;
     }
 
-    dmMsg(1, "rdataSize=%d bytes?\n", res->rdataSize);
+    dmMsg(1, "rdataSize=%d bytes?\n", res->resSize);
 
     BOOL eof = FALSE;
-    int left = res->rdataSize;
-    char *ptr = res->rdata;
+    int left = res->resSize;
+    char *ptr = res->resData;
     int current_section;
     while (!eof && left > 0)
     {
@@ -230,7 +230,7 @@
 
 static void engineResVorbisFree(DMResource *res)
 {
-    dmFree(res->rdata);
+    dmFree(res->resData);
 }
 
 static BOOL engineResVorbisProbe(DMResource *res, const char *fext)
@@ -296,9 +296,9 @@
 {
     DMResource *res;
     if (eng != NULL &&
-        (res = dmres_find(eng->resources, name)) != NULL &&
-        res->rdata != NULL)
-        return res->rdata;
+        (res = dmResourceFind(eng->resources, name)) != NULL &&
+        res->resData != NULL)
+        return res->resData;
     else
     {
         dmError("Could not find resource '%s'.\n", name);