diff --git a/src/general.c b/src/general.c
index 40c04ce..70321ab 100644
--- a/src/general.c
+++ b/src/general.c
@@ -90,8 +90,10 @@ char *FCEU_MakeFName(int type, int id1, char *cd1)
          break;
    }
 
+   FCEU_printf(" FCEU_MakeFName: %s\n", tmp);
+
    ret = (char*)malloc(strlen(tmp) * sizeof(char) + 1);
-   strncpy(ret, tmp, strlen(tmp) + 1);
+   strcpy(ret, tmp);
 
    return(ret);
 }
diff --git a/src/general.h b/src/general.h
index 4225b4f..0eb2ea5 100644
--- a/src/general.h
+++ b/src/general.h
@@ -6,17 +6,12 @@ extern uint32 uppow2(uint32 n);
 
 char *FCEU_MakeFName(int type, int id1, char *cd1);
 
-#define FCEUMKF_STATE  1
-#define FCEUMKF_SNAP  2
-#define FCEUMKF_SAV  3
-#define FCEUMKF_CHEAT  4
-#define FCEUMKF_FDSROM  5
-#define FCEUMKF_PALETTE  6
-#define FCEUMKF_GGROM  7
-#define FCEUMKF_IPS  8
-#define FCEUMKF_FDS  9
-#define FCEUMKF_MOVIE  10
-#define FCEUMKF_NPTEMP  11
-#define FCEUCOPY_FAMI 12
+enum FILE_TYPES
+{
+    FCEUMKF_FDSROM = 1,
+    FCEUMKF_PALETTE,
+    FCEUMKF_GGROM,
+    FCEUMKF_FDS
+};
 
 #endif