Refactor #3 - Removal of CFileNameGenerator class