fix paths and variable names