diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c
index 5c57f7b2a5..0c1ddf33a9 100644
--- a/apps/plugins/dict.c
+++ b/apps/plugins/dict.c
@@ -147,8 +147,8 @@ long reverse (long N) {
 #endif
 
 /* data files */
-#define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index"
-#define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc"
+#define DICT_INDEX PLUGIN_APPS_DIR "/dict.index"
+#define DICT_DESC PLUGIN_APPS_DIR "/dict.desc"
 
 /* the main plugin function */
 enum plugin_status plugin_start(const void* parameter)
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c
index ddff1e95d2..5d625a33a2 100644
--- a/apps/plugins/keybox.c
+++ b/apps/plugins/keybox.c
@@ -22,7 +22,7 @@
 #include "lib/md5.h"
 PLUGIN_HEADER
 
-#define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat"
+#define KEYBOX_FILE PLUGIN_APPS_DIR "/keybox.dat"
 #define BLOCK_SIZE 8
 #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */
 #define FIELD_LEN 32 /* should be enough for anyone ;) */
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 75a37e18a8..23470d4780 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -39,8 +39,8 @@ PLUGIN_HEADER
 #define PB_USB  2
 #define PB_QUIT 1
 
-#define DATA_FILE   PLUGIN_DIR "/games/pegbox.data"
-#define SAVE_FILE   PLUGIN_DIR "/games/pegbox.save"
+#define DATA_FILE   PLUGIN_GAMES_DIR "/pegbox.data"
+#define SAVE_FILE   PLUGIN_GAMES_DIR "/pegbox.save"
 
 #define ROWS       8   /* Number of rows on each board */
 #define COLS       12  /* Number of columns on each board */
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 0221e0328f..4bacf413fa 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -32,7 +32,7 @@ PLUGIN_HEADER
 #define LAP_Y TIMER_Y+1
 #define MAX_LAPS 64
 
-#define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat"
+#define STOPWATCH_FILE PLUGIN_APPS_DIR "/stopwatch.dat"
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD