2 files changed, 16 insertions, 16 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index a306138356..67cc08a032 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1694,13 +1694,13 @@
   desc: in settings menu
   user:
   <source>
-    *: "Tag Cache"
+    *: "Database"
   </source>
   <dest>
-    *: "Tag Cache"
+    *: "Database"
   </dest>
   <voice>
-    *: "Tag Cache"
+    *: "Database"
   </voice>
 </phrase>
 <phrase>
@@ -1764,10 +1764,10 @@
   desc: while initializing tagcache on boot
   user:
   <source>
-    *: "Committing tagcache"
+    *: "Committing database"
   </source>
   <dest>
-    *: "Committing tagcache"
+    *: "Committing database"
   </dest>
   <voice>
     *: ""
@@ -1960,13 +1960,13 @@
   desc: show ID3 Database
   user:
   <source>
-    *: "ID3 Database"
+    *: "Database"
   </source>
   <dest>
-    *: "ID3 Database"
+    *: "Database"
   </dest>
   <voice>
-    *: "ID3 Database"
+    *: "Database"
   </voice>
 </phrase>
 <phrase>
@@ -8543,13 +8543,13 @@
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
   <source>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </source>
   <dest>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </dest>
   <voice>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/tagcache.h b/apps/tagcache.h
index 281f3b86a2..4194851aab 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -64,11 +64,11 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
 #define TAGCACHE_MAX_CLAUSES 32
 
 /* Tag database files. */
-#define TAGCACHE_FILE_TEMP       ROCKBOX_DIR "/tagcache_tmp.tcd"
-#define TAGCACHE_FILE_MASTER     ROCKBOX_DIR "/tagcache_idx.tcd"
-#define TAGCACHE_FILE_INDEX      ROCKBOX_DIR "/tagcache_%d.tcd"
-#define TAGCACHE_FILE_CHANGELOG  ROCKBOX_DIR "/tagcache_changelog.txt"
-#define TAGCACHE_STATEFILE       ROCKBOX_DIR "/tagcache_state.tcd"
+#define TAGCACHE_FILE_TEMP       ROCKBOX_DIR "/database_tmp.tcd"
+#define TAGCACHE_FILE_MASTER     ROCKBOX_DIR "/database_idx.tcd"
+#define TAGCACHE_FILE_INDEX      ROCKBOX_DIR "/database_%d.tcd"
+#define TAGCACHE_FILE_CHANGELOG  ROCKBOX_DIR "/database_changelog.txt"
+#define TAGCACHE_STATEFILE       ROCKBOX_DIR "/database_state.tcd"
 
 /* Flags */
 #define FLAG_DELETED    0x0001  /* Entry has been removed from db */