Variable names fixed

More coherent references to files using file_x as ref to all file refs.