#11: Fixed bugs in filename generation, removed unnecessary.
#11: Functions for generating filenames moved to fn_composers.py.