fix file name and variables