Small changes in naming of files and variables