--- a/tools/lib64gfx.h	Mon May 27 08:27:01 2019 +0300
+++ b/tools/lib64gfx.h	Mon May 27 08:35:35 2019 +0300
@@ -24,34 +24,34 @@
 
 
 // Bitmap constants
-#define C64_SCR_WIDTH          320
-#define C64_SCR_HEIGHT         200
-#define C64_SCR_CH_WIDTH       (C64_SCR_WIDTH/8)
-#define C64_SCR_CH_HEIGHT      (C64_SCR_HEIGHT/8)
-#define C64_MAX_EXTRA_DATA     64
+#define D64_SCR_WIDTH          320
+#define D64_SCR_HEIGHT         200
+#define D64_SCR_CH_WIDTH       (D64_SCR_WIDTH/8)
+#define D64_SCR_CH_HEIGHT      (D64_SCR_HEIGHT/8)
+#define D64_MAX_EXTRA_DATA     64
 
 // C64 video screen pixel aspect ratio on PAL
-#define C64_SCR_PAR_XY         (0.9365f)
+#define D64_SCR_PAR_XY         (0.9365f)
 
 // Sprite constants
-#define C64_SPR_WIDTH_PX       24
-#define C64_SPR_HEIGHT_PX      21
-#define C64_SPR_WIDTH_UT       (C64_SPR_WIDTH_PX / 8) // bytes
-#define C64_SPR_HEIGHT_UT      C64_SPR_HEIGHT_PX
-#define C64_SPR_SIZE           ((C64_SPR_WIDTH_UT * C64_SPR_HEIGHT_UT) + 1)
+#define D64_SPR_WIDTH_PX       24
+#define D64_SPR_HEIGHT_PX      21
+#define D64_SPR_WIDTH_UT       (D64_SPR_WIDTH_PX / 8) // bytes
+#define D64_SPR_HEIGHT_UT      D64_SPR_HEIGHT_PX
+#define D64_SPR_SIZE           ((D64_SPR_WIDTH_UT * D64_SPR_HEIGHT_UT) + 1)
 
 // Character constants
-#define C64_CHR_WIDTH_PX       8
-#define C64_CHR_HEIGHT_PX      8
-#define C64_CHR_WIDTH_UT       1 // bytes
-#define C64_CHR_HEIGHT_UT      8 // lines
-#define C64_CHR_SIZE           (C64_CHR_WIDTH_UT * C64_CHR_HEIGHT_UT)
+#define D64_CHR_WIDTH_PX       8
+#define D64_CHR_HEIGHT_PX      8
+#define D64_CHR_WIDTH_UT       1 // bytes
+#define D64_CHR_HEIGHT_UT      8 // lines
+#define D64_CHR_SIZE           (D64_CHR_WIDTH_UT * D64_CHR_HEIGHT_UT)
 
 // Etc.
-#define C64_NCOLORS            16
-#define C64_VIDBANK_SIZE       (16*1024)
-#define C64_MAX_SPRITES        1024
-#define C64_MAX_CHARS          256
+#define D64_NCOLORS            16
+#define D64_VIDBANK_SIZE       (16*1024)
+#define D64_MAX_SPRITES        1024
+#define D64_MAX_CHARS          256
 
 
 // Different supported flags/modes
@@ -150,7 +150,7 @@
 {
     BOOL multicolor, xexpand, yexpand;
     int color, xc, yc;
-    Uint8 data[C64_SPR_HEIGHT_UT][C64_SPR_WIDTH_UT];
+    Uint8 data[D64_SPR_HEIGHT_UT][D64_SPR_WIDTH_UT];
 } DMC64Sprite;
 
 
@@ -177,9 +177,9 @@
 
     // Extra data areas used by some formats,
     // for example raster colours might be stored
-    DMC64MemBlock extraData[C64_MAX_EXTRA_DATA];
+    DMC64MemBlock extraData[D64_MAX_EXTRA_DATA];
 
-    //DMC64Sprite sprites[C64_MAX_SPRITES];
+    //DMC64Sprite sprites[D64_MAX_SPRITES];
 } DMC64Image;
 
 
@@ -301,7 +301,7 @@
 //
 // Global variables
 //
-extern DMColor           dmDefaultC64Palette[C64_NCOLORS];
+extern DMColor           dmDefaultC64Palette[D64_NCOLORS];
 extern DMC64ImageFormat  dmC64ImageFormats[];
 extern const int         ndmC64ImageFormats;