Just small changes for file->constructor names consistency I proposed in Issue #605