diff --git a/songs/Green_Day/Minority.sg b/songs/Green_Day/Minority.sg
index d16b7d4d..1b960a44 100644
--- a/songs/Green_Day/Minority.sg
+++ b/songs/Green_Day/Minority.sg
@@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Minority}
-  [by=Green Day,cov=warning,album=Warning]
+  [by=Green Day,cov=greenday-warning,album=Warning]
 
   \cover
   \gtab{C}{X32010}
diff --git a/songs/Green_Day/warning.jpg b/songs/Green_Day/greenday-warning.jpg
similarity index 100%
rename from songs/Green_Day/warning.jpg
rename to songs/Green_Day/greenday-warning.jpg
diff --git a/songs/Julien_Clerc/Travailler_c_est_trop_dur.sg b/songs/Julien_Clerc/Travailler_c_est_trop_dur.sg
index ed0d716f..7bdab4c7 100644
--- a/songs/Julien_Clerc/Travailler_c_est_trop_dur.sg
+++ b/songs/Julien_Clerc/Travailler_c_est_trop_dur.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Travailler, c'est trop dur}
-  [by=Julien Clerc,cov=best-of,album=Best of]
+  [by=Julien Clerc,cov=best-of-julien-clerc,album=Best of]
 
   \cover
   \gtab{E}{022100}
diff --git a/songs/Julien_Clerc/best-of.jpg b/songs/Julien_Clerc/best-of-julien-clerc.jpg
similarity index 100%
rename from songs/Julien_Clerc/best-of.jpg
rename to songs/Julien_Clerc/best-of-julien-clerc.jpg
diff --git a/songs/Telephone/Cendrillon.sg b/songs/Telephone/Cendrillon.sg
index 587fc6a7..fa3b9bec 100644
--- a/songs/Telephone/Cendrillon.sg
+++ b/songs/Telephone/Cendrillon.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Cendrillon}
-  [by=Téléphone,cov=best-of,album=Best of]
+  [by=Téléphone,cov=best-of-telephone,album=Best of]
 
   \cover
   \gtab{A}{X02220}
diff --git a/songs/Telephone/best-of.jpg b/songs/Telephone/best-of-telephone.jpg
similarity index 100%
rename from songs/Telephone/best-of.jpg
rename to songs/Telephone/best-of-telephone.jpg