Changed some variable and file names.