Better file variable namings