diff --git a/admin-root/smartpopup.html b/admin-root/smartpopup.html
index f33d6b8b..2c0d5458 100755
--- a/admin-root/smartpopup.html
+++ b/admin-root/smartpopup.html
@@ -117,14 +117,14 @@ function plOutputRow(x,vis)
 '<option value="genre">Genre<\/option>',
 '<option value="year">Year<\/option>',
 '<option value="rating">Rating<\/option>',
-'<option value="songlength">Length<\/option>',
-'<option value="playcount">Play count<\/option>',
+'<option value="song_length">Length<\/option>',
+'<option value="play_count">Play count<\/option>',
 '<\/optgroup>',
 '<optgroup label="Advanced">',
 '<option value="track">Track<\/option>',
-'<option value="totaltracks">Tracks total<\/option>',
+'<option value="total_tracks">Tracks total<\/option>',
 '<option value="disc">Disc<\/option>',
-'<option value="totaldiscs">Discs total<\/option>',
+'<option value="total_discs">Discs total<\/option>',
 '<option value="comment">Comment<\/option>',
 '<option value="type">Type<\/option>',
 '<option value="composer">Composer<\/option>',
@@ -136,7 +136,7 @@ function plOutputRow(x,vis)
 '<optgroup label="Technical">',
 '<option value="bitrate">Bitrate<\/option>',
 '<option value="samplerate">Samplerate<\/option>',
-'<option value="filesize">Filesize<\/option>',
+'<option value="file_size">Filesize<\/option>',
 '<option value="bpm">Beats per minute<\/option>',
 '<option value="compilation">Compilation<\/option>',
 '<\/optgroup>',