Replace filename key with fileTarget in template
Remove additional old compatibility code