I am using WACK to rip my CD collection into both FLAC (single file with seperate cue sheet) and MP3. Evertything is working like a dream except for one thing. My FLAC files are saved in: E:\FLAC\Artist Name\Album Name (YEAR). Each folder contains 2 files, the FLAC file and the cue sheet, e.g.,

"Down In Albion (2005).cue" and
"Down In Albion (2005).flac"

The corresponding cue sheet reads:

QUOTE
REM GENRE "Indie Rock"
REM DATE 2005
REM DISCID E80EFC10
REM COMMENT "ExactAudioCopy v0.95b3"
PERFORMER "Babyshambles"
TITLE "Down In Albion"
FILE "Down In Albion (2005).flac" WAVE
TRACK 01 AUDIO
ETC. ETC.


This naming scheme can however only be achieved by hand, since WACK contains a bug when creating file names. For example, when I rip the album from Dirty Pretty Things, the following files are created:

"Dirty Pretty Things - Waterloo To Anywhere.cue"
"Waterloo To Anywhere (2006).flac"

The beginning of the cue file reads:

QUOTE
REM GENRE Britpop
REM DATE 2006
REM DISCID 9307CB0B
REM COMMENT "ExactAudioCopy v0.95b3"
PERFORMER "Dirty Pretty Things"
TITLE "Waterloo To Anywhere"
FILE "Dirty Pretty Things - Waterloo To Anywhere.flac" WAVE


I therefore have to peform the following steps manually:
  1. In the file name, change "Dirty Pretty Things - Waterloo To Anywhere.cue" into "Waterloo To Anywhere (2006).cue"
    [list=1]
  2. In the cue sheet, change Dirty Pretty Things - Waterloo To Anywhere.flac" into "Waterloo To Anywhere (2006).flac".


My question is if there is an automated way of achieving steps 1 and 2 above. Or, should I configure EAC / WACK differently?