--- a/src/dmres.h	Mon May 14 11:20:05 2018 +0300
+++ b/src/dmres.h	Mon May 14 11:45:33 2018 +0300
@@ -148,33 +148,33 @@
 
 
 // Opening and closing resources
-int          dmf_open(DMResourceLib *lib, const char *, DMResource **handle);
-void         dmf_close(DMResource *);
+int          dmf_open(DMResourceLib *lib, const char *, DMResource **phandle);
+void         dmf_close(DMResource *fh);
 
 int          dmf_open_memio(DMResourceLib *lib, const char *, Uint8 *buf, size_t len, DMResource **phandle);
 #ifdef DM_USE_STDIO
 int          dmf_open_stdio(const char *filename, const char *mode, DMResource **phandle);
-int          dmf_open_stdio_stream(FILE *, DMResource **phandle);
+int          dmf_open_stdio_stream(FILE *fh, DMResource **phandle);
 #endif
 
 
 // Basic resource access functions
-int          dmfreset(DMResource *);
-int          dmferror(DMResource *);
-int          dmfseek(DMResource *, const off_t, const int);
-off_t        dmfsize(DMResource *);
-off_t        dmftell(DMResource *);
-BOOL         dmfeof(DMResource *);
-int          dmfgetc(DMResource *);
-int          dmfputc(int, DMResource *);
-size_t       dmfread(void *, const size_t, const size_t, DMResource *);
-size_t       dmfwrite(const void *, const size_t, const size_t, DMResource *);
-char *       dmfgets(char *s, int size, DMResource * f);
+int          dmfreset(DMResource *fh);
+int          dmferror(DMResource *fh);
+int          dmfseek(DMResource *fh, const off_t offset, const int whence);
+off_t        dmfsize(DMResource *fh);
+off_t        dmftell(DMResource *fh);
+BOOL         dmfeof(DMResource *fh);
+int          dmfgetc(DMResource *fh);
+int          dmfputc(int val, DMResource *fh);
+size_t       dmfread(void *ptr, const size_t size, const size_t nmemb, DMResource *fh);
+size_t       dmfwrite(const void *ptr, const size_t size, const size_t nmemb, DMResource *fh);
+char *       dmfgets(char *str, const int size, DMResource *fh);
 
 
 // Helper functions for endianess based reading etc
-int          dmf_read_str(DMResource *, void *, const size_t);
-BOOL         dmf_read_byte(DMResource *, Uint8 *);
+BOOL         dmf_read_str(DMResource *fh, void *ptr, const size_t len);
+BOOL         dmf_read_byte(DMResource *fh, Uint8 *val);
 
 #define DM_DEFINE_FFUNC(xname, xtype, z)          \
 BOOL         dmf_read_ ## xname (DMResource *fh, xtype *v);