I'm not opposed to variable/function-name refactoring, but they should be in a clean commit, and they should improve clarity.  I don't have strong feelings on `prefix` vs. `file_prefix`, particularly if `prefix` is being used more generally (database keyword, URL identifier).  If it is only used for files, `file_prefix` is fine.

All that to say, I'm with @ketch on this.